From f878d29050cebcf1765e93c5941099de4ce7b3f2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 05 七月 2023 11:35:38 +0800
Subject: [PATCH] 修改不兼容报错
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 1 +
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index a0f5b6a..5f721ab 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -155,6 +155,7 @@
this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
if (res.data.code == 200) {
this.loginForm.tenantId = res.data.data[0].TENANT_ID;
+ console.log(res.data.data);
this.loginForm.region = res.data.data
}
})
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 af427ba..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
@@ -214,7 +214,7 @@
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_ID",this.propertiesTenantId);
map.put("TENANT_NAME","绠＄悊缁�");
mapList.add(0,map);
}
--
Gitblit v1.9.3