From 201518a621d0d5f3c2040217950b10a5eaba22e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 14:51:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 3 ++-
1 files changed, 2 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 e67ace5..dfd6b12 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,7 @@
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);
@@ -206,4 +206,5 @@
*/
List<SysUser> selectListByDeptIds(@Param("projectIds")List<String> projectIds);
+ Integer selectUserCount(@Param("projectIds")List<String> projectIds, @Param("deptType")Integer deptType);
}
--
Gitblit v1.7.1