From 4b2a52eecd3b425bfe592ff7fc2959ef7391b4b6 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 14:14:41 +0800
Subject: [PATCH] 发货文件上传修改
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 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 e7739aa..ad9a8b3 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -1,12 +1,5 @@
package com.ruoyi.project.system.controller;
-import java.util.List;
-import java.util.Set;
-
-import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
-import com.ruoyi.project.system.service.ISysUserDeptService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginBody;
@@ -15,9 +8,26 @@
import com.ruoyi.framework.security.service.SysPermissionService;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysMenuService;
+import com.ruoyi.project.system.service.ISysUserDeptService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* 鐧诲綍楠岃瘉
@@ -25,22 +35,15 @@
* @author ruoyi
*/
@RestController
+@AllArgsConstructor
public class SysLoginController
{
- @Autowired
private SysLoginService loginService;
-
- @Autowired
private ISysMenuService menuService;
-
- @Autowired
private SysPermissionService permissionService;
-
- @Autowired
private TokenService tokenService;
-
- @Autowired
private ISysUserDeptService userDeptService;
+ private SysDeptMapper sysDeptMapper;
/**
* 鐧诲綍鏂规硶
@@ -64,11 +67,20 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @GetMapping("getInfo")
+ @GetMapping("/getInfo")
public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
+ // 鑾峰彇褰撳墠鐧诲綍鍏徃
+ Long 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,11 +121,17 @@
}
}
- @GetMapping("/userDeptList/{userId}")
- public AjaxResult userDeptList(@PathVariable Long userId){
- SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
- sysUserDeptVo.setUserId(userId);
- return AjaxResult.success(userDeptService.selectUserDeptList(sysUserDeptVo));
+ @GetMapping("/userLoginFacotryList")
+ public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ List<SysUserDeptVo> sysUserDeptVoList = userDeptService.userLoginFacotryList(sysUserDeptVo);
+ Map<Long, SysUserDeptVo> map = sysUserDeptVoList.stream()
+ .collect(Collectors.toMap(
+ SysUserDeptVo::getDeptId,
+ item -> item,
+ (existing, replacement) -> existing // 濡傛灉閲嶅锛屼繚鐣欑涓�涓�
+ ));
+ List<SysUserDeptVo> uniqueList = new ArrayList<>(map.values());
+ return AjaxResult.success(uniqueList);
}
/**
--
Gitblit v1.9.3