app综治字典label逻辑调整

src/main/java/com/sooka/sponest/mobile/comprehensive/personBasicInfoController/AppPersonBasicInfoController.java

@@ -59,7 +59,7 @@ public class AppPersonBasicInfoController {
             row.put("householdRegistrationLabel", comprehensiveCityCodeMap.get(row.get("householdRegistration")));//户籍地 2260
             row.put("nativePlaceLabel", comprehensiveCityCodeMap.get(row.get("nativePlace")));//籍贯 2260
         }
-        return AjaxResult.success();
+        return AjaxResult.success(rows);
     }
 
 
@@ -306,17 +306,26 @@ public class AppPersonBasicInfoController {
         Integer pageSize = pageDomain.getPageSize();
         Integer delFlag = personBasicInfo.getDelFlag();
         Integer personType = personBasicInfo.getPersonType();
-        TableDataInfo list = personBasicInfoService.getOtherList(pageNum, pageSize, delFlag, personType);
-        if(HttpStatus.SUCCESS == list.getCode()){
-            return AjaxResult.success(list.getRows());
+        List<HashMap<String, Object>> list = (List<HashMap<String, Object>>) personBasicInfoService.getOtherList(pageNum, pageSize, delFlag, personType);
+        Map<String, Object> comprehensiveCityCodeMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//2260
+        if(!list.isEmpty() && null != list){
+            for (HashMap<String, Object> row : list) {
+                row.put("householdRegistrationLabel", comprehensiveCityCodeMap.get(row.get("householdRegistration")));//户籍地 2260
+                row.put("nativePlaceLabel", comprehensiveCityCodeMap.get(row.get("nativePlace")));//籍贯 2260
+            }
+            return AjaxResult.success(list);
         }else{
-            return AjaxResult.error(list.getCode(),list.getMsg());
+            return AjaxResult.error(500, "list is null!");
         }
     }
 
     @GetMapping("/PersonBasicInfo/getOtherEdit")
     public AjaxResult getOtherEdit(OtherPersonInfo otherPersonInfo){
-        return personBasicInfoService.getOtherEdit(otherPersonInfo.getBasicId(), otherPersonInfo.getPersonType());
+        HashMap<String, Object> map = personBasicInfoService.getOtherEdit(otherPersonInfo.getBasicId(), otherPersonInfo.getPersonType());
+        Map<String, Object> comprehensiveCityCodeMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//2260
+        map.put("householdRegistrationLabel", comprehensiveCityCodeMap.get(map.get("householdRegistration")));//户籍地 2260
+        map.put("nativePlaceLabel", comprehensiveCityCodeMap.get(map.get("nativePlace")));//籍贯 2260
+        return AjaxResult.success(map);
     }
 
     @GetMapping("/PersonBasicInfo/getAllUserInfo")