From ce7582bd007b671dc311ee8511cc409230ef1b1c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 17:49:29 +0800
Subject: [PATCH] yys 1.出库管理-分页查询 2.出库管理-导出 3.出库管理-领用 4.出库台账-分页查询 5.出库台账-导出 6.出库台账-删除 7.库存管理-分页查询 8.库存管理-导出 9.库存管理-删除
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 15fb7e1..c9f0e1e 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -1,7 +1,10 @@
package com.ruoyi.project.system.controller;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
@@ -76,7 +79,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
// 鑾峰彇褰撳墠鐧诲綍鍏徃
- Integer tenantId = loginUser.getTenantId();
+ Long tenantId = loginUser.getTenantId();
if(null != tenantId){
user.setTenantId(tenantId);
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
@@ -126,7 +129,15 @@
@GetMapping("/userLoginFacotryList")
public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
- return AjaxResult.success(userDeptService.userLoginFacotryList(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