1.仓库添加关联用户和单据类型候选列表页添加分页功能

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java

@@ -7,6 +7,7 @@ import com.glxp.sale.admin.entity.auth.AuthRole;
 import com.glxp.sale.admin.entity.auth.AuthRoleAdmin;
 import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
 import com.glxp.sale.admin.exception.JsonException;
+import com.glxp.sale.admin.req.ListPageRequest;
 import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
 import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
@@ -339,8 +340,16 @@ public class AuthAdminController {
      * @return
      */
     @AuthRuleAnnotation("")
-    @GetMapping("/admin/auth/admin/hospitalUserList")
+    @PostMapping("/admin/auth/admin/hospitalUserList")
-    public BaseResponse getHospitalUserList() {
+    public BaseResponse getHospitalUserList(@RequestBody ListPageRequest pageRequest) {
-        return ResultVOUtils.success(authAdminService.getHospitalUserList());
+        if (null == pageRequest) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<AuthAdmin> hospitalUserList = authAdminService.getHospitalUserList(pageRequest);
+        PageInfo<AuthAdmin> pageInfo = new PageInfo<>(hospitalUserList);
+        PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(pageInfo.getList());
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 }

api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.auth;
 
 
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.req.ListPageRequest;
 import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
 
 import java.util.List;
@@ -33,6 +34,6 @@ public interface AuthAdminService {
      *
      * @return
      */
-    List<AuthAdmin> getHospitalUserList();
+    List<AuthAdmin> getHospitalUserList(ListPageRequest pageRequest);
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java

@@ -1,10 +1,10 @@
 package com.glxp.sale.admin.service.auth.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.auth.AuthAdminDao;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.exception.JsonException;
+import com.glxp.sale.admin.req.ListPageRequest;
 import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.common.enums.ResultEnum;
@@ -132,13 +132,13 @@ public class AuthAdminServiceImpl implements AuthAdminService {
     }
 
     @Override
-    public List<AuthAdmin> getHospitalUserList() {
+    public List<AuthAdmin> getHospitalUserList(ListPageRequest pageRequest) {
-        //查询未被禁用的医院用户
+        if (pageRequest.getPage() != null) {
-        List<AuthAdmin> userList = authAdminDao.selectHospitalUser();
+            int offset = (pageRequest.getPage() - 1) * pageRequest.getLimit();
-        if (CollUtil.isEmpty(userList)) {
+            PageHelper.offsetPage(offset, pageRequest.getLimit());
-            return Collections.emptyList();
         }
-        return userList;
+        //查询未被禁用的医院用户
+        return authAdminDao.selectHospitalUser();
     }