From 7250c03a4c49ca09671fb933b5cdf8d6c0b24848 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 29 Jul 2022 15:52:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=80=99=E9=80=89=E5=88=97=E8=A1=A8=E9=A1=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/AuthAdminController.java      | 15 ++++++++++++---
 .../sale/admin/service/auth/AuthAdminService.java |  3 ++-
 .../service/auth/impl/AuthAdminServiceImpl.java   | 14 +++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
index 69057f2..b980340 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
+++ b/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")
-    public BaseResponse getHospitalUserList() {
-        return ResultVOUtils.success(authAdminService.getHospitalUserList());
+    @PostMapping("/admin/auth/admin/hospitalUserList")
+    public BaseResponse getHospitalUserList(@RequestBody ListPageRequest pageRequest) {
+        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);
     }
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java
index ca4ea64..77c43bc 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java
+++ b/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);
 
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java
index c08c8f9..6121f34 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java
+++ b/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() {
-        //查询未被禁用的医院用户
-        List<AuthAdmin> userList = authAdminDao.selectHospitalUser();
-        if (CollUtil.isEmpty(userList)) {
-            return Collections.emptyList();
+    public List<AuthAdmin> getHospitalUserList(ListPageRequest pageRequest) {
+        if (pageRequest.getPage() != null) {
+            int offset = (pageRequest.getPage() - 1) * pageRequest.getLimit();
+            PageHelper.offsetPage(offset, pageRequest.getLimit());
         }
-        return userList;
+        //查询未被禁用的医院用户
+        return authAdminDao.selectHospitalUser();
     }