From 1f238ae264c0dfca87bba9ea9da5456153991eaa Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:03 +0800
Subject: [PATCH] 修改system服务部分接口
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java
index 831bbd2..6e445e7 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java
@@ -37,10 +37,12 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,6 +68,12 @@
private final ITenantService tenantService;
private final ITenantPackageService tenantPackageService;
+
+ /**
+ * 瓒呯绉熸埛id
+ */
+ @Value("${user-info.tenant-id}")
+ private String tenantId;
/**
* 璇︽儏
@@ -218,15 +226,20 @@
}
/**
- * 鏌ヨ绉熸埛淇℃伅锛岀畝閿�煎褰㈠娍
+ * 鏌ヨ绉熸埛淇℃伅锛岄敭鍊煎褰㈠紡
* @return
*/
@GetMapping("/tenant-map")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "涓嬫媺绉熸埛淇℃伅")
public R<List> findAll() {
- List<Map<String, Object>> map = tenantService.selectMaps();
- return R.data(map);
+ List<Map<String, Object>> mapList = tenantService.selectMaps();
+ if(Func.isNotEmpty(tenantId)){
+ Map<String, Object> map = new HashMap<>();
+ map.put("绠＄悊缁�", tenantId);
+ mapList.add(map);
+ }
+ return R.data(mapList);
}
/**
--
Gitblit v1.9.3