From 259a60f240fdfff356a236d380d8d682949fc571 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 09:24:25 +0800
Subject: [PATCH] feat(环保门禁): 巡检设备数据回传开放接口(无人机/机器人/AI摄像头)、无人值守地磅模块(表+后端+日报)、车辆采集照片字段、修复车辆修改接口缺@RequestBody
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 17 ++++++++++++++---
1 files changed, 14 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 15fb7e1..b165f3e 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;
@@ -70,13 +73,13 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @GetMapping("getInfo")
+ @GetMapping("/getInfo")
public AjaxResult getInfo()
{
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