From 5b131ad3fd59d51ffd1ed4021c90b6a45bbe1b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B0=8F=E7=8E=8B=E5=AD=90?= Date: Wed, 28 Feb 2024 14:54:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E7=A7=9F=E6=88=B7?= =?UTF-8?q?id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/service/SysLoginService.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java index 57e9c48..357dac1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java @@ -5,7 +5,6 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.mybatisflex.core.tenant.TenantManager; import com.ruoyi.common.core.constant.*; import com.ruoyi.common.core.core.domain.dto.RoleDTO; import com.ruoyi.common.core.enums.LoginType; @@ -21,21 +20,15 @@ import com.ruoyi.common.tenant.helper.TenantHelper; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.bo.SysSocialBo; import com.ruoyi.system.domain.bo.SysUserBo; -import com.ruoyi.system.domain.vo.SysSocialVo; -import com.ruoyi.system.domain.vo.SysTenantVo; -import com.ruoyi.system.domain.vo.SysUserVo; -import com.ruoyi.system.service.ISysPermissionService; -import com.ruoyi.system.service.ISysSocialService; -import com.ruoyi.system.service.ISysTenantService; +import com.ruoyi.system.domain.vo.*; +import com.ruoyi.system.service.*; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthUser; -import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.common.core.core.domain.model.LoginUser; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.MessageUtils; -import com.ruoyi.system.service.ISysUserService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Value; @@ -70,6 +63,12 @@ public class SysLoginService { @Resource private ISysUserService userService; + @Resource + private ISysDeptService deptService; + + @Resource + private ISysRoleService roleService; + @Resource private ISysTenantService tenantService; @@ -198,9 +197,12 @@ public class SysLoginService { loginUser.setUserType(user.getUserType()); loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId())); loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId())); - loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName()); - List roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class); - loginUser.setRoles(roles); + TenantHelper.dynamic(user.getTenantId(), () -> { + SysDeptVo dept = deptService.selectDeptById(user.getDeptId()); + loginUser.setDeptName(ObjectUtil.isNull(dept) ? "" : dept.getDeptName()); + List roles = roleService.selectRolesByUserId(user.getUserId()); + loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); + }); return loginUser; }