Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppHousingEstateController.java

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppHousingEstateController.java

@@ -87,8 +87,8 @@ public class AppHousingEstateController extends BaseController {
      * 小区下拉选小区管理
      */
     @GetMapping("/comprehensivehousingestate/getHousingEstate")
-    public AjaxResult getHousingEstate(ComprehensiveHousingEstate comprehensiveHousingEstate) {
-        return remoteHousingEstateService.getHousingEstate(comprehensiveHousingEstate);
+    public AjaxResult getHousingEstate(ComprehensiveHousingEstate housingEstate) {
+        return remoteHousingEstateService.getHousingEstate(housingEstate);
     }
 
 

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

@@ -44,7 +44,7 @@ public class AppPersonBasicInfoController {
         Map<String, Object> comprehensiveReligiousBeliefMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF);//宗教信仰字典值
         Map<String, Object> comprehensivePoliticalStatusMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLITICAL_STATUS);//政治面貌字典值
         Map<String, Object> comprehensiveOccupationalCategoryMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY);//职业类别字典值
-        Map<String, Object> comprehensiveCityCodeMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//2260
+//        Map<String, Object> comprehensiveCityCodeMap = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//2260
         for (HashMap<String, Object> row : rows) {
             row.put("genderLabel", comprehensiveSexMap.get(row.get("gender")));//性别字典值
             row.put("nationLabel", comprehensiveNationMap.get(row.get("nation")));//民族字典值
@@ -53,8 +53,8 @@ public class AppPersonBasicInfoController {
             row.put("religiousBeliefLabel", null == row.get("religiousBelief") ? null : comprehensiveReligiousBeliefMap.get(row.get("religiousBelief")));//宗教信仰字典值
             row.put("politicalOutlookLabel", comprehensivePoliticalStatusMap.get(row.get("politicalOutlook")));//政治面貌字典值
             row.put("occupationalCategoryLabel", comprehensiveOccupationalCategoryMap.get(row.get("occupationalCategory")));//职业类别字典值
-            row.put("householdRegistrationLabel", comprehensiveCityCodeMap.get(row.get("householdRegistration")));//户籍地 2260
-            row.put("nativePlaceLabel", comprehensiveCityCodeMap.get(row.get("nativePlace")));//籍贯 2260
+//            row.put("householdRegistrationLabel", comprehensiveCityCodeMap.get(row.get("householdRegistration")));//户籍地 2260
+//            row.put("nativePlaceLabel", comprehensiveCityCodeMap.get(row.get("nativePlace")));//籍贯 2260
         }
         return AjaxResult.success(rows);
     }

src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteSystemBaseService.java

@@ -198,6 +198,6 @@ public interface RemoteSystemBaseService {
     @GetMapping("/menuApp/selectMenuListByParentIdAndRoleId/{parentId}")
     AjaxResult getMenuListByParentId(@PathVariable("parentId") String parentId);
 
-    @PostMapping("/user/userFeginlist")
-    R<List<SysUser>> getUserList(@RequestBody SysUser sysUser);
+    @PostMapping("/user/userFeginlistWithPage")
+    List<SysUser> getUserList(@RequestBody SysUser sysUser);
 }

src/main/java/com/sooka/sponest/mobile/remoteapi/factory/RemoteSystemBaseServiceFallbackFactory.java

@@ -158,7 +158,7 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
             }
 
             @Override
-            public R<List<SysUser>> getUserList(@RequestBody SysUser sysUser) {
+            public List<SysUser> getUserList(@RequestBody SysUser sysUser) {
                 return null;
             }
         };

src/main/java/com/sooka/sponest/mobile/system/users/UserController.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.mobile.system.users;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysUser;
 import com.sooka.sponest.mobile.remoteapi.RemoteSystemBaseService;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,11 +27,12 @@ public class UserController {
 
     @PostMapping("/userFeginList")
     public AjaxResult getUserList(@RequestBody SysUser sysUser){
-        R<List<SysUser>> userList = remoteSystemBaseService.getUserList(sysUser);
-        if(HttpStatus.SUCCESS == userList.getCode()){
-            return AjaxResult.success(userList.getData());
-        }else{
-            return AjaxResult.error(userList.getCode(), userList.getMsg());
-        }
+        List<SysUser> userList = remoteSystemBaseService.getUserList(sysUser);
+        return AjaxResult.success(userList);
+//        if(HttpStatus.SUCCESS == userList.getCode()){
+//            return AjaxResult.success(userList.getRows());
+//        }else{
+//            return AjaxResult.error(userList.getCode(), userList.getMsg());
+//        }
     }
 }