From 2f558094d133549b7e1867c6f9d674ec04cef360 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 02 三月 2023 23:32:29 +0800 Subject: [PATCH] fix 修复 !pr292 相关问题 并优化写法 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java index f55b5c8..ecff031 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java @@ -1,14 +1,16 @@ package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.SmsLoginBody; +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.satoken.utils.LoginHelper; +import com.ruoyi.common.tenant.helper.TenantHelper; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.bo.SysTenantBo; import com.ruoyi.system.domain.vo.RouterVo; @@ -118,11 +120,11 @@ @GetMapping("/tenant/list") public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception { List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo()); - List<TenantListVo> voList = BeanUtil.copyToList(tenantList, TenantListVo.class); + List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class); // 鑾峰彇鍩熷悕 String host = new URL(request.getRequestURL().toString()).getHost(); // 鏍规嵁鍩熷悕杩涜绛涢�� - List<TenantListVo> list = voList.stream().filter(vo -> StringUtils.equals(vo.getDomain(), host)).toList(); + List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host)); return R.ok(CollUtil.isNotEmpty(list) ? list : voList); } @@ -135,6 +137,10 @@ public R<UserInfoVo> getInfo() { UserInfoVo userInfoVo = new UserInfoVo(); LoginUser loginUser = LoginHelper.getLoginUser(); + if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) { + // 瓒呯骇绠$悊鍛� 濡傛灉閲嶆柊鍔犺浇鐢ㄦ埛淇℃伅闇�娓呴櫎鍔ㄦ�佺鎴� + TenantHelper.clearDynamic(); + } SysUserVo user = userService.selectUserById(loginUser.getUserId()); userInfoVo.setUser(user); userInfoVo.setPermissions(loginUser.getMenuPermission()); -- Gitblit v1.9.3