From 869a5b02c515dca42022c53647edbfbef8c2c3c1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 11 十月 2023 15:39:26 +0800
Subject: [PATCH] 租户条件从常量类配置方式修改为nacos上拉取配置
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 943f36f..6cc6556 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -84,7 +84,7 @@
@Transactional(rollbackFor = Exception.class)
public boolean submit(User user) {
if (StringUtil.isBlank(user.getTenantId())) {
- // user.setTenantId(BladeConstant.ADMIN_TENANT_ID);
+ // user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
// 榛樿璁剧疆涓虹鐞嗙粍涓嬬殑鐢ㄦ埛
user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
}
@@ -106,7 +106,7 @@
Boolean flag = true;
for (User user : users){
if (StringUtil.isBlank(user.getTenantId())) {
- user.setTenantId(BladeConstant.ADMIN_TENANT_ID);
+ user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
}
String tenantId = user.getTenantId();
if (Func.isNotEmpty(user.getPassword())) {
@@ -166,7 +166,7 @@
@Override
public List<User> selectAllUser(User user, Long deptId){
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
+ List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? StringPool.EMPTY : AuthUtil.getTenantId()));
return users;
}
--
Gitblit v1.9.3