From b2a9367b562ae3c664ee46745beab73b4568d4d9 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 10:59:28 +0800
Subject: [PATCH] 过滤仓库管理员的显示
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 51092ab..cfb4b42 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -12,6 +12,7 @@
import java.util.Set;
import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
@@ -549,6 +550,9 @@
finSysTenantUser.setUserPhone(phone);
Long sysUserId = finSysTenantUser.getSysUserId();
List<S_role> roleList = finSysTenantUserService.getRoleBySysUserId(sysUserId);
+ // 杩囨护浠撳簱绠＄悊鍛樼殑鏄剧ず
+ roleList.removeIf(role -> role.getRole_name().equals("浠撳簱绠＄悊鍛�"));
+
HashMap<String, Object> map = new HashMap<>();
map.put("list", roleList);
map.put("data", finSysTenantUser);
@@ -586,18 +590,14 @@
// 鏌ヨ鐖剁被鐨刼rgcode 闇�瑕佸皢鑷繁鐨刼rg鍏堟煡鍑烘潵 鍐嶆牴鎹畃arentid 鏌ョ埗绫�
String tenantId = sysInfo.getTenantId();
if (StringUtils.isNotEmpty(tenantId)) {
- List<FinSysTenant> select = finSysTenantService.select(new FinSysTenant(Long.valueOf(tenantId)));
- if (select != null && select.size() > 0) {
- FinSysTenant finSysTenant = select.get(0);
- if (finSysTenant != null && finSysTenant.getParentId() != null) {
- List<FinSysTenant> parents =
- finSysTenantService.select(new FinSysTenant(finSysTenant.getParentId()));
- if (parents != null && parents.size() > 0) {
- sysInfo.setParentCode(parents.get(0).getCode());
- }
+ FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(Long.valueOf(tenantId)));
+ if (finSysTenant != null && finSysTenant.getParentId() != null) {
+ FinSysTenant parentTenant = finSysTenantService.get(new FinSysTenant(finSysTenant.getParentId()));
+ if (ObjectUtils.isNotEmpty(parentTenant)) {
+ sysInfo.setParentCode(parentTenant.getCode());
}
-
}
+
}
}
return ResponseValue.success(sysInfo);
@@ -624,14 +624,14 @@
// 閫夋嫨鐨勬潈闄�
List<Long> roleList = user.getRoleList();
// 鍏堝垹闄ゅ啀娣诲姞
- if (list != null && list.size() > 0) {
+ if (!CollectionUtils.isEmpty(list)) {
Long sysUserId = user.getSysUserId();
finSysTenantUserService.execDelRoleUserList(sysUserId);
// 鍒犻櫎搴撶鍛樹俊鎭褰�
list.stream().filter(item -> "浠撳簱绠＄悊鍛�".equals(item.getRole_name())).findFirst()
.ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
}
- if (roleList != null && roleList.size() > 0) {
+ if (!CollectionUtils.isEmpty(roleList)) {
finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
}
return ResponseValue.success(1);
@@ -654,7 +654,7 @@
}
// 鑾峰彇杩愮淮绠＄悊
List<S_dept> depts = this.finSysTenantUserService.selectDept(roleName);
- if (depts == null || depts.size() == 0) {
+ if (CollectionUtils.isEmpty(depts)) {
return ResponseValue.error(roleName + "鐨勮鑹蹭笉瀛樺湪");
}
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
--
Gitblit v1.9.1