|
@@ -202,8 +202,11 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
|
|
queryName2(info);
|
|
queryName2(info);
|
|
//审核表取一条最新数据
|
|
//审核表取一条最新数据
|
|
TenantApplyRecordWrapper.LastRecord lastRecordEntry = baseMapper.selectEntry(id);
|
|
TenantApplyRecordWrapper.LastRecord lastRecordEntry = baseMapper.selectEntry(id);
|
|
- //设置地名
|
|
|
|
- queryName(lastRecordEntry);
|
|
|
|
|
|
+
|
|
|
|
+ if (!(lastRecordEntry == null)){
|
|
|
|
+ //设置地名
|
|
|
|
+ queryName(lastRecordEntry);
|
|
|
|
+ }
|
|
info.setLastApplyRecord(lastRecordEntry);
|
|
info.setLastApplyRecord(lastRecordEntry);
|
|
return info;
|
|
return info;
|
|
} else {
|
|
} else {
|
|
@@ -211,7 +214,9 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
|
|
TenantApplyRecordWrapper.TenantApplyRecord tenantApplyRecord = baseMapper.selectLastEntry(id);
|
|
TenantApplyRecordWrapper.TenantApplyRecord tenantApplyRecord = baseMapper.selectLastEntry(id);
|
|
queryName2(tenantApplyRecord);
|
|
queryName2(tenantApplyRecord);
|
|
TenantApplyRecordWrapper.LastRecord lastRecord = baseMapper.selectSecondEntry(id);
|
|
TenantApplyRecordWrapper.LastRecord lastRecord = baseMapper.selectSecondEntry(id);
|
|
- queryName(lastRecord);
|
|
|
|
|
|
+ if (!(lastRecord == null)){
|
|
|
|
+ queryName(lastRecord);
|
|
|
|
+ }
|
|
tenantApplyRecord.setLastApplyRecord(lastRecord);
|
|
tenantApplyRecord.setLastApplyRecord(lastRecord);
|
|
return tenantApplyRecord;
|
|
return tenantApplyRecord;
|
|
}
|
|
}
|