From 3f79e2df49117af65b7f59a5f3ad82e3283f42b1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 28 九月 2023 12:02:41 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..f85f3f4 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;
@@ -211,10 +212,11 @@
@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())){
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;
}
--
Gitblit v1.9.3