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

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

@@ -1,23 +1,24 @@
 package com.glxp.api.admin.controller.auth;
 
 import com.github.pagehelper.PageInfo;
-import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
-import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
-import com.glxp.api.admin.res.PageSimpleResponse;
-import com.glxp.api.admin.util.GennerOrderUtils;
-import com.glxp.api.common.enums.ResultEnum;
-import com.glxp.api.common.res.BaseResponse;
-import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.auth.AuthRole;
 import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
+import com.glxp.api.admin.req.ListPageRequest;
+import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
+import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.res.auth.AuthAdminResponse;
+import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
 import com.glxp.api.admin.service.auth.AuthRoleAdminService;
 import com.glxp.api.admin.service.auth.AuthRoleService;
+import com.glxp.api.admin.util.GennerOrderUtils;
 import com.glxp.api.admin.util.PasswordUtils;
-import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
+import com.glxp.api.common.enums.ResultEnum;
-import com.glxp.api.admin.res.auth.AuthAdminResponse;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -256,8 +257,16 @@ public class AuthAdminController {
      */
     @AuthRuleAnnotation("")
     @GetMapping("/admin/auth/admin/hospitalUserList")
-    public BaseResponse getHospitalUserList() {
+    public BaseResponse getHospitalUserList(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/api/admin/service/auth/AuthAdminService.java

@@ -1,8 +1,9 @@
 package com.glxp.api.admin.service.auth;
 
 
-import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
+import com.glxp.api.admin.req.ListPageRequest;
+import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
 
 import java.util.List;
 
@@ -29,5 +30,5 @@ public interface AuthAdminService {
      *
      * @return
      */
-    List<AuthAdmin> getHospitalUserList();
+    List<AuthAdmin> getHospitalUserList(ListPageRequest pageRequest);
 }

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

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