From fd0abc5a5fa8fd5e8864d626fe7ae5697239c74c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 16:45:56 +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 | 6 ++++--
1 files changed, 4 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 87c74aa..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;
@@ -213,8 +214,9 @@
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+"\":\""+this.propertiesTenantId+"\"");
- mapList.add(map);
+ map.put("TENANT_ID",this.propertiesTenantId);
+ map.put("TENANT_NAME","绠＄悊缁�");
+ mapList.add(0,map);
}
return mapList;
}
--
Gitblit v1.9.3