diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java index 554e5dbc..17b284ad 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/SysController.java @@ -3,14 +3,10 @@ package com.czg.controller.admin; import com.czg.account.dto.user.SysUserAddDTO; import com.czg.account.dto.user.SysUserEditDTO; import com.czg.account.dto.user.SysUserEditPwdDTO; -import com.czg.account.entity.SysUser; -import com.czg.account.entity.SysUsersRoles; import com.czg.account.service.SysUserService; import com.czg.account.vo.SysUserDetailVO; -import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckRole; import com.czg.resp.CzgResult; -import com.czg.sa.StpKit; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -40,7 +36,7 @@ public class SysController { // @SaAdminCheckPermission("sysUser:list") @SaAdminCheckRole("admin") @GetMapping - public CzgResult> list(String key, String startTime, String endTime, Integer status) { + public CzgResult> list(String key, String startTime, String endTime, Integer status) { return CzgResult.success(sysUserService.getPage(key, startTime, endTime, status)); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java index cf37f045..c9e0431a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java @@ -25,7 +25,7 @@ public interface SysUserService extends IService { Boolean removeUserAndRole(Long id); - Page getPage(String key, String startTime, String endTime, Integer status); + Page getPage(String key, String startTime, String endTime, Integer status); Boolean edit(SysUserEditDTO sysUserEditDTO); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java index faf2edb5..9ea59256 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/SysUserMapper.java @@ -1,7 +1,11 @@ package com.czg.service.account.mapper; import com.czg.account.entity.SysUser; +import com.czg.account.vo.SysUserDetailVO; import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 系统用户 映射层。 @@ -11,4 +15,5 @@ import com.mybatisflex.core.BaseMapper; */ public interface SysUserMapper extends BaseMapper { + List page(@Param("key") String key, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("status") Integer status); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java index 5cf8e52b..f8026a2a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java @@ -22,6 +22,8 @@ import com.czg.service.account.mapper.SysRoleMapper; import com.czg.service.account.mapper.SysUserMapper; import com.czg.service.account.mapper.SysUsersRolesMapper; import com.czg.utils.PageUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -99,24 +101,9 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public Page getPage(String key, String startTime, String endTime, Integer status) { - QueryWrapper queryWrapper = new QueryWrapper(); - if (StrUtil.isNotBlank(key)) { - queryWrapper.and(column(SysUser::getAccount).like(key).or(column(SysUser::getNickName).like(key))); - } - - if (StrUtil.isNotBlank(startTime)) { - queryWrapper.ge(SysUser::getCreateTime, DateUtil.parse(startTime)); - } - - if (StrUtil.isNotBlank(endTime)) { - queryWrapper.le(SysUser::getCreateTime, DateUtil.parse(endTime)); - } - - if (status != null) { - queryWrapper.eq(SysUser::getStatus, status); - } - return page(PageUtil.buildPage(), queryWrapper); + public Page getPage(String key, String startTime, String endTime, Integer status) { + PageHelper.startPage(PageUtil.buildPageHelp()); + return PageUtil.convert(new PageInfo<>(mapper.page(key, startTime, endTime, status))); } @Override @@ -180,8 +167,8 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void download(String key, String startTime, String endTime, Integer status, HttpServletResponse response) throws IOException { - Page sysUserPage = getPage(key, startTime, endTime, status); - List records = sysUserPage.getRecords(); + Page sysUserPage = getPage(key, startTime, endTime, status); + List records = sysUserPage.getRecords(); // 1. 创建 ExcelWriter // true 表示使用 XLSX 格式 diff --git a/cash-service/account-service/src/main/resources/mapper/SysUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/SysUserMapper.xml index cd8ab06b..0d771f66 100644 --- a/cash-service/account-service/src/main/resources/mapper/SysUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/SysUserMapper.xml @@ -4,4 +4,25 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +