From 29c138254853bacf032381982bc9154fdbe566dd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 11 十月 2025 17:50:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 e4893e0..d5cf97c 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
@@ -53,17 +53,20 @@
*/
@ApiOperation(value = "获取用户列表")
@PostMapping("/list")
- @PreAuthorize("@ss.hasPermi('system:user')")
+// @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult list(@RequestBody SysUserQuery query)
{
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType == 1 || roleType == 4 || roleType == 5){
+ query.setRoleType(roleType);
+ }
PageInfo<SysUserVO> list = userService.pageList(query);
return AjaxResult.success(list);
}
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/listNotPage")
- @PreAuthorize("@ss.hasPermi('system:user')")
-
+// @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult listNotPage()
{
List<SysUser> list = userService.selectList();
@@ -156,6 +159,8 @@
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysUser user)
{
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ user.setRoleType(roleType);
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
@@ -166,7 +171,7 @@
return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setCreateBy(getUsername());
- user.setPassword(SecurityUtils.encryptPassword("123456"));
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
userService.insertUser(user);
return AjaxResult.success();
}
@@ -231,6 +236,9 @@
{
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
+ if(!org.springframework.util.StringUtils.hasLength(user.getPassword())){
+ user.setPassword("a123456");
+ }
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
return AjaxResult.success(userService.resetPwd(user));
--
Gitblit v1.7.1