Преглед на файлове

app修改获取全部用户列表接口,增加分页筛选

Wang-Xiao-Ran преди 1 година
родител
ревизия
222d452aed

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

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

+ 1 - 1
src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteSystemBaseService.java

@@ -199,5 +199,5 @@ public interface RemoteSystemBaseService {
     AjaxResult getMenuListByParentId(@PathVariable("parentId") String parentId);
 
     @PostMapping("/user/userFeginlistWithPage")
-    R<List<SysUser>> getUserList(@RequestBody SysUser sysUser);
+    List<SysUser> getUserList(@RequestBody SysUser sysUser);
 }

+ 1 - 1
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;
             }
         };

+ 8 - 6
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());
+//        }
     }
 }