From d8ad5605a031477c252e029149a4735a1a20ffbd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 20:46:27 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 280e736..f8aff5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -12,6 +13,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
+import com.ruoyi.system.model.TDept;
+import com.ruoyi.system.model.TProjectDept;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.SysUserVO;
@@ -23,6 +26,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,22 +51,42 @@
private ISysDeptService deptService;
@Autowired
private TokenService tokenService;
-
+ @Resource
+ private TProjectDeptService projectDeptService;
+ @Resource
+ private TDeptService tdeptService;
/**
* 获取用户列表
*/
@ApiOperation(value = "获取用户列表")
@PostMapping("/list")
- @PreAuthorize("@ss.hasPermi('system:user')")
- public AjaxResult list(@RequestBody SysUserQuery query)
+ public AjaxResult<PageInfo<SysUserVO>> list(@RequestBody SysUserQuery query)
{
+ List<SysUser> sysUsers = userService.selectAllList();
+
+ if (org.springframework.util.StringUtils.hasLength(query.getDeptName())){
+ List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ List<String> deptIds = tdeptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
+ .stream().map(TDept::getId).collect(Collectors.toList());
+ projectIds.addAll(deptIds);
+ if (projectIds.isEmpty()){
+ return AjaxResult.success(new PageInfo<>());
+ }
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ projectIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ return AjaxResult.success(new PageInfo<>());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
PageInfo<SysUserVO> list = userService.pageList(query);
return AjaxResult.success(list);
}
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/listNotPage")
- @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult listNotPage()
{
@@ -150,7 +174,6 @@
/**
* 新增用户
*/
- // @PreAuthorize("@ss.hasPermi('system:user:add')")
@ApiOperation(value = "新增用户管理")
@Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -239,7 +262,7 @@
/**
* 状态修改
*/
- @ApiOperation(value = "状态修改")
+ @ApiOperation(value = "状态修改/启用禁用")
@Log(title = "用户信息-状态修改", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
--
Gitblit v1.7.1