From 4e0b0be90a8bf14a59f4cfee7959534adea24ba3 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期六, 12 七月 2025 18:45:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 10be789..58716af 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -181,7 +181,32 @@ List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId); - List<SysUser> selectUserByDeptId(@Param("id")String id); + List<SysUser> selectUserByDeptId(@Param("ids")List<String> ids); List<TaskFinishListVO> pageListReport(@Param("query")DataReportQuery query, @Param("pageInfo")PageInfo<TaskFinishListVO> pageInfo); + + /** + * 通过部门id查询用户 + * @param deptId + * @return + */ + List<SysUser> selectListByDeptId(@Param("deptId")String deptId); + + /** + * 通过部门类型查询用户 + * @param deptType + * @return + */ + List<SysUser> selectListByDeptType(@Param("deptType")Integer deptType); + + /** + * 通过部门id查询用户 + * @param projectIds + * @return + */ + List<SysUser> selectListByDeptIds(@Param("projectIds")List<String> projectIds); + + Integer selectUserCount(@Param("projectIds")List<String> projectIds, @Param("deptType")Integer deptType); + + List<SysUser> selectUserByNickName(@Param("nickName")String nickName); } -- Gitblit v1.7.1