From 4a3dd290b99f08b6232c3f2f6d8907db15624128 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 十月 2023 10:25:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java
index 799420e..3d041a6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java
@@ -194,7 +194,7 @@
List<String> tenantIds = this.list(Wrappers.<Tenant>query().lambda().in(Tenant::getId, ids))
.stream().map(tenant -> Func.toStr(tenant.getTenantId())).distinct().collect(Collectors.toList());
CacheUtil.clear(SYS_CACHE, tenantIds);
- if (tenantIds.contains(BladeConstant.ADMIN_TENANT_ID)) {
+ if (tenantIds.contains(nacosConfigCache.getAdminUserInfo().getTenantId())) {
throw new ServiceException("涓嶅彲鍒犻櫎绠＄悊绉熸埛!");
}
boolean tenantTemp = this.deleteLogic(ids);
@@ -212,9 +212,9 @@
@Override
public List<Map<String,Object>> selectMaps(){
List<Map<String, Object>> mapList = listMaps(new QueryWrapper<Tenant>().select("TENANT_ID", "TENANT_NAME"));
- if(Func.isNotEmpty(nacosConfigCache.getAdminUserInfo().getTenantId()) && !this.containsSameKeys(mapList,nacosConfigCache.getAdminUserInfo().getTenantId())){
+ if(Func.isNotEmpty(NacosConfigCache.getAdminUserInfo().getTenantId()) && !this.containsSameKeys(mapList,nacosConfigCache.getAdminUserInfo().getTenantId())){
Map<String, Object> map = new HashMap<>();
- map.put("TENANT_ID",nacosConfigCache.getAdminUserInfo().getTenantId());
+ map.put("TENANT_ID",NacosConfigCache.getAdminUserInfo().getTenantId());
map.put("TENANT_NAME","绠＄悊缁�");
mapList.add(0,map);
}
--
Gitblit v1.9.3