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 hospitalUserList = authAdminService.getHospitalUserList(pageRequest); + PageInfo pageInfo = new PageInfo<>(hospitalUserList); + PageSimpleResponse 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 getHospitalUserList(); + List 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 getHospitalUserList() { - //查询未被禁用的医院用户 - List userList = authAdminDao.selectHospitalUser(); - if (CollUtil.isEmpty(userList)) { - return Collections.emptyList(); + public List getHospitalUserList(ListPageRequest pageRequest) { + if (pageRequest.getPage() != null) { + int offset = (pageRequest.getPage() - 1) * pageRequest.getLimit(); + PageHelper.offsetPage(offset, pageRequest.getLimit()); } - return userList; + //查询未被禁用的医院用户 + return authAdminDao.selectHospitalUser(); }