From 92e15c2f16fb5e7fc7426241557da55a7fdcf136 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 三月 2023 22:53:00 +0800
Subject: [PATCH] reset !pr324 有逻辑性问题 暂时回滚
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
index 9c0a638..12cf1fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
@@ -10,10 +10,12 @@
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.tenant.helper.TenantHelper;
import com.ruoyi.system.domain.bo.SysTenantBo;
import com.ruoyi.system.domain.vo.SysTenantVo;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysTenantService;
+import com.ruoyi.web.domain.vo.LoginTenantVo;
import com.ruoyi.web.domain.vo.LoginVo;
import com.ruoyi.web.domain.vo.TenantListVo;
import com.ruoyi.web.service.SysLoginService;
@@ -134,14 +136,18 @@
* @return 绉熸埛鍒楄〃
*/
@GetMapping("/tenant/list")
- public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception {
+ public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
// 鑾峰彇鍩熷悕
String host = new URL(request.getRequestURL().toString()).getHost();
// 鏍规嵁鍩熷悕杩涜绛涢��
List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host));
- return R.ok(CollUtil.isNotEmpty(list) ? list : voList);
+ // 杩斿洖瀵硅薄
+ LoginTenantVo vo = new LoginTenantVo();
+ vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
+ vo.setTenantEnabled(TenantHelper.isEnable());
+ return R.ok(vo);
}
}
--
Gitblit v1.9.3