From 858ddcd71b737c1e2d9f9c1fb9d009209cb97b4e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 22 Feb 2024 16:47:26 +0800
Subject: [PATCH] 场所检查新增场所类型查询，安全自查查询调整，新增安全自查导出
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 9003153..d25cb7e 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -212,9 +212,9 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
- if (null == deptId && !AuthUtil.isAdministrator()) {
- deptId = Long.parseLong(AuthUtil.getDeptId());
+ public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
+ deptId = AuthUtil.getDeptId();
}
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
--
Gitblit v1.9.3