From 18c6b5131991b02e4a473ae0622d9eca7b417bb4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 25 May 2023 19:59:21 +0800
Subject: [PATCH] 用户自定义查询修改（新增只显示本部门查询条件判断）
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 fe6248e..7a60151 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
@@ -141,9 +141,22 @@
return userDeptService.saveBatch(userDeptList);
}
+ /**
+ * 自定义分页查询
+ * @param page
+ * @param user
+ * @param deptId
+ * @param tenantId
+ * @return
+ */
@Override
public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ List<Long> deptIdList = new ArrayList<>();
+ if (null!=user.getIsDept()) {
+ deptIdList.add(deptId);
+ }else {
+ deptIdList = SysCache.getDeptChildIds(deptId);
+ }
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
--
Gitblit v1.9.3