From dfa74d70bc18445534c120a27b4b9260aeb2e2f3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十月 2023 10:04:47 +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 | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 87c74aa..bf8fc63 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
@@ -16,10 +16,12 @@
*/
package com.vci.ubcs.system.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.*;
import com.vci.ubcs.system.mapper.TenantMapper;
import com.vci.ubcs.system.service.*;
@@ -59,10 +61,9 @@
public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> implements ITenantService {
/**
- * nacos涓婇厤缃殑瓒呯绉熸埛id
+ * nacos涓婇厤缃殑瓒呯绉熸埛
*/
- @Value("${user-info.tenant-id}")
- private String propertiesTenantId;
+ private final NacosConfigCache nacosConfigCache;
private final TenantId tenantId;
private final IRoleService roleService;
@@ -193,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);
@@ -211,15 +212,32 @@
@Override
public List<Map<String,Object>> selectMaps(){
List<Map<String, Object>> mapList = listMaps(new QueryWrapper<Tenant>().select("TENANT_ID", "TENANT_NAME"));
- if(Func.isNotEmpty(this.propertiesTenantId)){
+ if(Func.isNotEmpty(nacosConfigCache.getAdminUserInfo().getTenantId()) && !this.containsSameKeys(mapList,nacosConfigCache.getAdminUserInfo().getTenantId())){
Map<String, Object> map = new HashMap<>();
- map.put("\"TENANT_ID\":\"绠＄悊缁刓"", "\""+this.propertiesTenantId+"\":\""+this.propertiesTenantId+"\"");
- mapList.add(map);
+ map.put("TENANT_ID",nacosConfigCache.getAdminUserInfo().getTenantId());
+ map.put("TENANT_NAME","绠＄悊缁�");
+ mapList.add(0,map);
}
return mapList;
}
/**
+ * 鍒ゆ柇鏁版嵁搴撲腑鏄惁瀛樺湪浜庨厤缃枃浠朵腑涓�鑷寸殑瓒呯淇℃伅
+ * @param collection
+ * @param value
+ * @return
+ */
+ private boolean containsSameKeys(List<Map<String, Object>> collection, String value) {
+ for (Map<String, Object> map : collection) {
+ Collection<Object> values = map.values();
+ if (values.contains(value)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
* 涓夊憳鐩稿叧閰嶇疆
* @return
*/
--
Gitblit v1.9.3