From 021843e983e56a6ded22bb73bdd4b6c69307b508 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 09:56:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087891=20=E5=85=A8=E6=89=80=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1--=E4=B8=AA=E5=88=AB=E7=A7=91=E5=AE=A4=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=90=8E=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllProjectStatisticsController.java | 5 +++-- .../com/jero/modules/system/mapper/SysUserMapper.java | 9 +++++++++ .../com/jero/modules/system/mapper/xml/SysUserMapper.xml | 8 ++++++++ .../com/jero/modules/system/service/ISysUserService.java | 2 ++ .../modules/system/service/impl/SysUserServiceImpl.java | 7 +++++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index f92744f6..88422acb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -12,6 +12,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.mail.commont.constant; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserService; import com.jero.project.service.IPayWorkingGroupService; @@ -264,8 +265,8 @@ public class AllProjectStatisticsController { queryWrapper.eq("org_code", departCode); queryWrapper.eq("del_flag", 0); queryWrapper.eq("status", 1); - List pageList = sysUserService.list(queryWrapper); - return Result.OK(pageList); + List sysUserSysDepartModels = sysUserService.listUserByOrgCode(departCode); + return Result.OK(sysUserSysDepartModels); } /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 0b3dd6b8..4f5d78bd 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -102,6 +102,14 @@ public interface SysUserMapper extends BaseMapper { * @return */ List getUserByOrgCode(IPage page, @Param("orgCode") String orgCode, @Param("userParams") SysUser userParams); +/** + * 根据 orgCode 查询用户，包括子部门下的用户 + * + * @param orgCode + * @param userParams 用户查询条件，可为空 + * @return + */ + List getUserByOrgCode(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams); /** @@ -171,4 +179,5 @@ public interface SysUserMapper extends BaseMapper { void forgetPassword(@Param("user") SysUser user); + List listUserByOrgCode(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 79e6adee..69b32cd9 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -217,4 +217,12 @@ select * from pay_manager_management where phone = #{username} and del_flag = 0; + + \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 1b214713..c1b5f17b 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -140,6 +140,8 @@ public interface ISysUserService extends IService { */ IPage queryUserByOrgCode(String orgCode, SysUser userParams, IPage page); + List listUserByOrgCode(String orgCode); + /** * 根据角色Id查询 * @param diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 3e445400..ab7e8e66 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -331,6 +331,13 @@ public class SysUserServiceImpl extends ServiceImpl impl return result; } + @Override + public List listUserByOrgCode(String orgCode) { + List list = baseMapper.listUserByOrgCode(orgCode, null); + + return list; + } + // 根据角色Id查询 @Override public IPage getUserByRoleId(Page page, String roleId, String username) {