From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 9 ++++++++-
1 files changed, 8 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 138f064..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
@@ -3,6 +3,8 @@
import java.util.List;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.applet.query.DataReportQuery;
+import com.ruoyi.system.applet.vo.TaskFinishListVO;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.vo.system.SysUserVO;
import org.apache.ibatis.annotations.Mapper;
@@ -171,13 +173,17 @@
List<SysUser> selectAllList();
- List<SysUserVO> pageList(@Param("query")SysUserQuery query);
+ List<SysUserVO> pageList(@Param("query")SysUserQuery query,@Param("pageInfo")PageInfo<SysUserVO> pageInfo);
void updatePassword(@Param("id") Long id,@Param("s") String s);
long selectIdByPhone(@Param("phonenumber") String phonenumber);
List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId);
+
+ List<SysUser> selectUserByDeptId(@Param("ids")List<String> ids);
+
+ List<TaskFinishListVO> pageListReport(@Param("query")DataReportQuery query, @Param("pageInfo")PageInfo<TaskFinishListVO> pageInfo);
/**
* 通过部门id查询用户
@@ -200,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