From d3239b6a098724db5a29b4f48ddad5f8a0402cea Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 05 七月 2023 15:35:38 +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 | 25 +++++++++++++++++++++++--
1 files changed, 23 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 b4b22d4..09bdcd7 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,6 +16,7 @@
*/
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;
@@ -57,6 +58,12 @@
@Service
@RequiredArgsConstructor
public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> implements ITenantService {
+
+ /**
+ * nacos涓婇厤缃殑瓒呯绉熸埛id
+ */
+ @Value("${user-info.tenant-id}")
+ private String propertiesTenantId;
private final TenantId tenantId;
private final IRoleService roleService;
@@ -198,12 +205,26 @@
return tenantTemp;
}
+ /**
+ * 鑾峰彇绉熸埛淇℃伅锛岄敭鍊煎褰㈠紡锛岀櫥褰曠晫闈㈣皟鐢�
+ * @return
+ */
@Override
public List<Map<String,Object>> selectMaps(){
- List<Map<String, Object>> maps = listMaps(new QueryWrapper<Tenant>().select("TENANT_ID", "TENANT_NAME"));
- return maps;
+ List<Map<String, Object>> mapList = listMaps(new QueryWrapper<Tenant>().select("TENANT_ID", "TENANT_NAME"));
+ if(Func.isNotEmpty(this.propertiesTenantId)){
+ Map<String, Object> map = new HashMap<>();
+ map.put("TENANT_ID",this.propertiesTenantId);
+ map.put("TENANT_NAME","绠＄悊缁�");
+ mapList.add(0,map);
+ }
+ return mapList;
}
+ /**
+ * 涓夊憳鐩稿叧閰嶇疆
+ * @return
+ */
@Override
public boolean findIsOpen() {
return this.ssaEnable;
--
Gitblit v1.9.3