ソースを参照

修改查询人员列表接口,只查询未绑定房间的人员列表。

Wang-Xiao-Ran 1 年間 前
コミット
a50c963d45

+ 15 - 7
src/main/java/com/sooka/sponest/mobile/comprehensive/personBasicInfoController/AppPersonBasicInfoController.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.mobile.comprehensive.personBasicInfoController;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
@@ -477,17 +478,24 @@ public class AppPersonBasicInfoController {
      */
     @GetMapping("/PersonBasicInfo/getAllUserInfo")
     public AjaxResult getAllUserInfo(PersonBasicInfo personBasicInfo){
-        AjaxResult allUserInfo = personBasicInfoService.getAllUserInfo(personBasicInfo.getName());
-        if ("200".equals(allUserInfo.get("code").toString())){
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        AjaxResult allUserInfo = personBasicInfoService.getAllUserInfo(personBasicInfo.getName(), pageNum, pageSize);
+        if (HttpStatus.SUCCESS == Integer.valueOf(allUserInfo.get("code").toString())){
             Map<String, Object> comprehensiveDictCacheToMap = getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);// 2260
             List<Map<String, Object>> data = (List<Map<String, Object>>) allUserInfo.get("data");
-            for (Map<String, Object> map : data) {
-                map.put("householdRegistrationLabel", comprehensiveDictCacheToMap.get(map.get("householdRegistration")));// 户籍地 2260
-                map.put("nativePlaceLabel", comprehensiveDictCacheToMap.get(map.get("nativePlace")));// 籍贯 2260
-                map.put("currentResidencePlaceLabel", comprehensiveDictCacheToMap.get(map.get("currentResidencePlace")));// 2260
+            if(null != data){
+                for (Map<String, Object> map : data) {
+                    map.put("householdRegistrationLabel", comprehensiveDictCacheToMap.get(map.get("householdRegistration")));// 户籍地 2260
+                    map.put("nativePlaceLabel", comprehensiveDictCacheToMap.get(map.get("nativePlace")));// 籍贯 2260
+                    map.put("currentResidencePlaceLabel", comprehensiveDictCacheToMap.get(map.get("currentResidencePlace")));// 2260
+                }
             }
+            return AjaxResult.success(allUserInfo.get("rows"));
+        }else{
+            return AjaxResult.error(allUserInfo.get("code").toString(),allUserInfo.get("msg"));
         }
-        return allUserInfo;
     }
 
 }