From 1f05a6ab6fbb2a8e6d702759ef9b52dbb6aeb148 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 04 六月 2025 16:46:25 +0800
Subject: [PATCH] 切换公司登录
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 5925a68..15fb7e1 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -3,9 +3,12 @@
import java.util.List;
import java.util.Set;
+import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysUserDeptService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.SecurityUtils;
@@ -42,6 +45,9 @@
@Autowired
private ISysUserDeptService userDeptService;
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+
/**
* 鐧诲綍鏂规硶
*
@@ -69,6 +75,15 @@
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
+ // 鑾峰彇褰撳墠鐧诲綍鍏徃
+ Integer tenantId = loginUser.getTenantId();
+ if(null != tenantId){
+ user.setTenantId(tenantId);
+ SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
+ if(!ObjectUtils.isEmpty(sysDept)){
+ user.setCurrentFactoryName(sysDept.getDeptName());
+ }
+ }
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -109,9 +124,9 @@
}
}
- @GetMapping("/userDeptList")
- public AjaxResult userDeptList(SysUserDeptVo sysUserDeptVo){
- return AjaxResult.success(userDeptService.selectUserDeptList(sysUserDeptVo));
+ @GetMapping("/userLoginFacotryList")
+ public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ return AjaxResult.success(userDeptService.userLoginFacotryList(sysUserDeptVo));
}
/**
--
Gitblit v1.9.3