mirror of
				https://github.com/dromara/RuoYi-Vue-Plus.git
				synced 2025-11-04 08:13:44 +08:00 
			
		
		
		
	update 优化 租户列表接口 避免登录之后列表被域名过滤
This commit is contained in:
		@@ -1,6 +1,7 @@
 | 
			
		||||
package org.dromara.web.controller;
 | 
			
		||||
 | 
			
		||||
import cn.dev33.satoken.annotation.SaIgnore;
 | 
			
		||||
import cn.dev33.satoken.exception.NotLoginException;
 | 
			
		||||
import cn.hutool.core.codec.Base64;
 | 
			
		||||
import cn.hutool.core.collection.CollUtil;
 | 
			
		||||
import cn.hutool.core.util.ObjectUtil;
 | 
			
		||||
@@ -194,8 +195,26 @@ public class AuthController {
 | 
			
		||||
     */
 | 
			
		||||
    @GetMapping("/tenant/list")
 | 
			
		||||
    public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
 | 
			
		||||
        // 返回对象
 | 
			
		||||
        LoginTenantVo result = new LoginTenantVo();
 | 
			
		||||
        boolean enable = TenantHelper.isEnable();
 | 
			
		||||
        result.setTenantEnabled(enable);
 | 
			
		||||
        // 如果未开启租户这直接返回
 | 
			
		||||
        if (!enable) {
 | 
			
		||||
            return R.ok(result);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
 | 
			
		||||
        List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
 | 
			
		||||
        try {
 | 
			
		||||
            // 如果只超管返回所有租户
 | 
			
		||||
            if (LoginHelper.isSuperAdmin()) {
 | 
			
		||||
                result.setVoList(voList);
 | 
			
		||||
                return R.ok(result);
 | 
			
		||||
            }
 | 
			
		||||
        } catch (NotLoginException ignored) {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // 获取域名
 | 
			
		||||
        String host;
 | 
			
		||||
        String referer = request.getHeader("referer");
 | 
			
		||||
@@ -208,11 +227,8 @@ public class AuthController {
 | 
			
		||||
        // 根据域名进行筛选
 | 
			
		||||
        List<TenantListVo> list = StreamUtils.filter(voList, vo ->
 | 
			
		||||
                StringUtils.equals(vo.getDomain(), host));
 | 
			
		||||
        // 返回对象
 | 
			
		||||
        LoginTenantVo vo = new LoginTenantVo();
 | 
			
		||||
        vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
 | 
			
		||||
        vo.setTenantEnabled(TenantHelper.isEnable());
 | 
			
		||||
        return R.ok(vo);
 | 
			
		||||
        result.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
 | 
			
		||||
        return R.ok(result);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user