From f31b1b0a442c83432de9bdf6bc4539bc68acaf6c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十月 2023 19:57:51 +0800
Subject: [PATCH] 修改从其他规则中克隆码段反馈信息错误的bug
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 f85f3f4..799420e 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
@@ -212,7 +212,7 @@
@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())){
+ 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_NAME","绠$悊缁�");
@@ -222,6 +222,22 @@
}
/**
+ * 鍒ゆ柇鏁版嵁搴撲腑鏄惁瀛樺湪浜庨厤缃枃浠朵腑涓�鑷寸殑瓒呯淇℃伅
+ * @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