소스 검색

后台端fix

haonan 1 년 전
부모
커밋
192d242a2b

+ 8 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantApplyRecordServiceImpl.java

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