From 277155c0d41b8131dd8c0694b578947dc64745ba Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 12 Jul 2024 15:10:03 +0800
Subject: [PATCH] 用户列表支持多部门
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
index bbb6bf4..2b93180 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
@@ -208,17 +208,22 @@
* 自定义分页查询
* @param page
* @param user
- * @param deptId
+ * @param deptIds
* @param tenantId
* @return
*/
@Override
- public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, String deptIds, String tenantId) {
List<Long> deptIdList = new ArrayList<>();
+ String [] deptidsStr = deptIds.split(",");
if (null!=user.getIsDept()) {
- deptIdList.add(deptId);
+ for (String str:deptidsStr) {
+ deptIdList.add(Long.parseLong(str));
+ }
}else {
- deptIdList = SysCache.getDeptChildIds(deptId);
+ for (String str:deptidsStr) {
+ deptIdList.addAll(SysCache.getDeptChildIds(Long.parseLong(str)));
+ }
}
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
--
Gitblit v1.9.3