From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
index 08b9197..ca0c220 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
@@ -58,9 +58,9 @@
private SysDeptService sysDeptService;
@Autowired
private SysParamsService paramsService;
-
@Autowired
SysMapService sysMapService;
+
public List<SysUser> page(QueryFilter queryFilter) {
// 鏅�氱鐞嗗憳锛屽彧鑳芥煡璇㈡墍灞為儴闂ㄥ強瀛愰儴闂ㄧ殑鏁版嵁
@@ -68,7 +68,6 @@
if (!user.isSuperAdmin()) {
queryFilter.addParam("deptIds", sysDeptService.getWithDescendantIds(user.getDeptId()));
}
-
// 鏌ヨ
return queryFilter.getPageList(baseDao.getList(queryFilter.getParams()));
}
@@ -79,7 +78,6 @@
if (!user.isSuperAdmin()) {
queryFilter.addParam("deptIds", sysDeptService.getWithDescendantIds(user.getDeptId()));
}
-
return baseDao.getList(queryFilter.getParams());
}
@@ -321,4 +319,8 @@
Integer num = baseDao.checkTestHome(systemId,userId);
return num;
}
+
+ public List<SysUser> getUsersList() {
+ return baseDao.getUsersList();
+ }
}
--
Gitblit v1.9.1