From 31403f1906b27c61dcff10b17295cda2dcb45cc2 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 12 Jan 2026 15:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E7=9A=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zcloud/basic/info/web/UserController.java | 6 +++--- .../com/zcloud/basic/info/command/query/UserQueryExe.java | 4 ++-- .../java/com/zcloud/basic/info/service/UserServiceImpl.java | 4 ++-- .../main/java/com/zcloud/basic/info/api/UserServiceI.java | 3 ++- .../zcloud/basic/info/persistence/mapper/UserMapper.java | 2 +- .../basic/info/persistence/repository/UserRepository.java | 2 +- .../persistence/repository/impl/UserRepositoryImpl.java | 4 ++-- web-infrastructure/src/main/resources/mapper/UserMapper.xml | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index 9c29757f..abd9bbec 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -72,9 +72,9 @@ public class UserController { } @ApiOperation("其他页面的用户分页，不需要权限控制") - @PostMapping("/PageByNopermission") - public PageResponse PageByNopermission(@RequestBody UserPageQry qry) { - return userService.PageByNopermission(qry); + @PostMapping("/pageByNopermission") + public PageResponse pageByNopermission(@RequestBody UserPageQry qry) { + return userService.pageByNopermission(qry); } @ApiOperation("所有数据") diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 5b0d50a1..0add4392 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -289,11 +289,11 @@ public class UserQueryExe { } - public PageResponse PageByNopermission(UserPageQry userPageQry) { + public PageResponse pageByNopermission(UserPageQry userPageQry) { Map params = PageQueryHelper.toHashMap(userPageQry); UserE userE = new UserE(); userE.dataProcessingRights(AuthContext.getTenantId(), params); - PageResponse pageResponse = userRepository.PageByNopermission(params); + PageResponse pageResponse = userRepository.pageByNopermission(params); List examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index 89099e34..ca825293 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -225,8 +225,8 @@ public class UserServiceImpl implements UserServiceI { } @Override - public PageResponse PageByNopermission(UserPageQry qry) { - return userQueryExe.PageByNopermission(qry); + public PageResponse pageByNopermission(UserPageQry qry) { + return userQueryExe.pageByNopermission(qry); } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index a1f08a39..c0624c6c 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -87,6 +87,7 @@ public interface UserServiceI { SingleResponse getUserIdByPhone(GetUserIdByPhoneCmd getUserIdByPhoneCmd); - PageResponse PageByNopermission(UserPageQry qry); + PageResponse pageByNopermission(UserPageQry qry); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index ab1d7fa7..307933db 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -44,6 +44,6 @@ public interface UserMapper extends BaseMapper { UserDO getUserIdByPhone(String phone); - IPage PageByNopermission(IPage iPage, @Param("ew") QueryWrapper queryWrapper); + IPage pageByNopermission(IPage iPage, @Param("ew") QueryWrapper queryWrapper); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index d4ab6864..e1898701 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -95,6 +95,6 @@ public interface UserRepository extends BaseRepository { UserDO getUserIdByPhone(@NotEmpty(message = "手机号不能为空") String phone); - PageResponse PageByNopermission(Map params); + PageResponse pageByNopermission(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index c5cfdebb..ff2d6c82 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -123,7 +123,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } @Override - public PageResponse PageByNopermission(Map params) { + public PageResponse pageByNopermission(Map params) { if (params.get("inDepartmentId") != null) { Long[] inDepartmentIds = (Long[]) params.get("inDepartmentId"); if (inDepartmentIds == null || inDepartmentIds.length == 0) { @@ -139,7 +139,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); - IPage result = userMapper.PageByNopermission(iPage, queryWrapper); + IPage result = userMapper.pageByNopermission(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 7fd725fb..99c2f5aa 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -170,7 +170,7 @@ left join post p on p.id = u.post_id ${ew.customSqlSegment} - select d.name as department_name, p.post_name,