From dc3336685e80c593a3654a6e53e3e1d1d13b2b50 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:13 +0800
Subject: [PATCH] fix(approve): 修复流程配置节点审批人为空时的异常处理
---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 14618a9..332d6b5 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -2,10 +2,12 @@
import java.util.List;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.*;
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,21 +40,13 @@
*/
@RestController
@RequestMapping("/system/user")
+@AllArgsConstructor
public class SysUserController extends BaseController
{
- @Autowired
private ISysUserService userService;
-
- @Autowired
private ISysRoleService roleService;
-
- @Autowired
private ISysDeptService deptService;
-
- @Autowired
private ISysPostService postService;
-
- @Autowired
private ISysUserDeptService userDeptService;
/**
@@ -65,6 +59,17 @@
startPage();
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(SysUser user)
+ {
+ List<SysUser> list = userService.selectUserList(user);
+ return AjaxResult.success(list);
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@@ -145,6 +150,7 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setTenantId(user.getDeptId());
return toAjax(userService.insertUser(user));
}
--
Gitblit v1.9.3