From 815c6be8d063ca1ec89079722d265585f7d3602c Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期五, 13 十月 2023 11:05:08 +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 | 4 ++-- 1 files changed, 2 insertions(+), 2 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 bf8fc63..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 @@ -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