配置管理 机构管理 查询加分页

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -5,8 +5,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.dao.TsUserDao;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +35,8 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
     private ITsInstitutionService tsInstitutionService;
     @Autowired
     private ITsUserService tsUserService;
+    @Autowired
+    private TsUserDao tsUserDao;
 
     /**
      * 查询所有机构
@@ -59,15 +63,14 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
 
     /**
      * 查询机构人员
-     * @param institutionId：机构ID
      * @return ResponseMessage<List<TsUser>>
      */
     @ApiOperation("查询机构的人员")
     @PostMapping("/user")
-    public ResponseMessage<Object> getUserByInstitutionId(TsUser tsUser){
+    public ResponseMessage<IPage<TsUser>> getUserByInstitutionId(TsUser tsUser){
 //        List<TsUser> tsUsers=tsUserService.getUserByInstitutionId(institutionId);
-        List<TsUser> tsUserList =  tsUserService.getUserByInstitutionId(tsUser);
-        return Result.success(tsUserList);
+        IPage<TsUser> tsUserIPage = tsUserService.getUserByInstitutionId(tsUser);
+        return Result.success(tsUserIPage);
     }
 
     @ApiOperation("导入机构数据")