fix

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

@@ -199,35 +199,19 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
 
         if (status.equals(AuthStatusEnum.DOING)){
             //如果是审核中 申请表取一条数据  审核表取一条数据
-            Set<Integer> codes = new HashSet<>();
-            codes.add(info.getCityCode());
-            codes.add(info.getProvinceCode());
-            codes.add(info.getRegionCode());
-
-            //将地区码转化为对应的地名
-            List<Integer> areaCodeList = new ArrayList<>();
-            areaCodeList.addAll(codes);
-
-            Map<Integer, String> codeNameMap = new HashMap<>();
-
-            if (!CollectionUtils.isEmpty(areaCodeList)) {
-                List<SysArea> sysAreaList = sysAreaService.queryByCodes(areaCodeList);
-                codeNameMap = sysAreaList.stream().collect(Collectors.toMap(SysArea::getCode,
-                        SysArea::getName));
-            }
-            info.setProvinceName(codeNameMap.get(info.getProvinceCode()));
-            info.setCityName(codeNameMap.get(info.getCityCode()));
-            info.setRegionName(codeNameMap.get(info.getRegionCode()));
-
-
+            queryName2(info);
             //审核表取一条最新数据
             TenantApplyRecordWrapper.LastRecord lastRecordEntry = baseMapper.selectEntry(id);
+            //设置地名
+            queryName(lastRecordEntry);
             info.setLastApplyRecord(lastRecordEntry);
             return info;
         } else {
             //如果是通过或者失败  审核表取前两条数据
             TenantApplyRecordWrapper.TenantApplyRecord tenantApplyRecord = baseMapper.selectLastEntry(id);
+            queryName2(tenantApplyRecord);
             TenantApplyRecordWrapper.LastRecord lastRecord = baseMapper.selectSecondEntry(id);
+            queryName(lastRecord);
             tenantApplyRecord.setLastApplyRecord(lastRecord);
             return tenantApplyRecord;
         }
@@ -235,6 +219,50 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
 
     }
 
+    private void queryName2(TenantApplyRecordWrapper.TenantApplyRecord info) {
+        Set<Integer> codes = new HashSet<>();
+        codes.add(info.getCityCode());
+        codes.add(info.getProvinceCode());
+        codes.add(info.getRegionCode());
+
+        //将地区码转化为对应的地名
+        List<Integer> areaCodeList = new ArrayList<>();
+        areaCodeList.addAll(codes);
+
+        Map<Integer, String> codeNameMap = new HashMap<>();
+
+        if (!CollectionUtils.isEmpty(areaCodeList)) {
+            List<SysArea> sysAreaList = sysAreaService.queryByCodes(areaCodeList);
+            codeNameMap = sysAreaList.stream().collect(Collectors.toMap(SysArea::getCode,
+                    SysArea::getName));
+        }
+        info.setProvinceName(codeNameMap.get(info.getProvinceCode()));
+        info.setCityName(codeNameMap.get(info.getCityCode()));
+        info.setRegionName(codeNameMap.get(info.getRegionCode()));
+    }
+
+    private void queryName(TenantApplyRecordWrapper.LastRecord lastRecordEntry) {
+        Set<Integer> codes2 = new HashSet<>();
+        codes2.add(lastRecordEntry.getCityCode());
+        codes2.add(lastRecordEntry.getProvinceCode());
+        codes2.add(lastRecordEntry.getRegionCode());
+
+        //将地区码转化为对应的地名
+        List<Integer> areaCodeList2 = new ArrayList<>();
+        areaCodeList2.addAll(codes2);
+
+        Map<Integer, String> codeNameMap2 = new HashMap<>();
+
+        if (!CollectionUtils.isEmpty(areaCodeList2)) {
+            List<SysArea> sysAreaList = sysAreaService.queryByCodes(areaCodeList2);
+            codeNameMap2 = sysAreaList.stream().collect(Collectors.toMap(SysArea::getCode,
+                    SysArea::getName));
+        }
+        lastRecordEntry.setProvinceName(codeNameMap2.get(lastRecordEntry.getProvinceCode()));
+        lastRecordEntry.setCityName(codeNameMap2.get(lastRecordEntry.getCityCode()));
+        lastRecordEntry.setRegionName(codeNameMap2.get(lastRecordEntry.getRegionCode()));
+    }
+
 
     @Override
     public Boolean entry(TenantApplyRecordWrapper.TenantEntry entry,Long verifyUserId) {