From b606905fcaf748edfc4bafb236e388f3295f2899 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:16:46 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 27aea74..53ed772 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
@@ -22,10 +22,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -55,6 +57,7 @@
*/
@ApiOperation(value = "获取用户列表")
@PostMapping("/list")
+ @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult list(@RequestBody SysUserQuery query)
{
PageInfo<SysUserVO> list = userService.pageList(query);
@@ -63,6 +66,8 @@
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/listNotPage")
+ @PreAuthorize("@ss.hasPermi('system:user')")
+
public AjaxResult listNotPage()
{
List<SysUser> list = userService.selectList();
@@ -155,7 +160,7 @@
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysUser user)
{
- user.setUserName(user.getPhonenumber());
+ user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -192,7 +197,9 @@
}
user.setUpdateBy(getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ if(StringUtils.isNotEmpty(user.getPassword())){
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ }
return AjaxResult.success(userService.updateUser(user));
}
@@ -241,11 +248,15 @@
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
{
+ SysUser loginUser = tokenService.getLoginUser().getUser();
SysUser user = new SysUser();
user.setUserId(dto.getUserId());
user.setStatus(String.valueOf(dto.getStatus()));
- user.setRemark(dto.getRemark());
+// user.setRemark(dto.getRemark());
user.setUpdateBy(getUsername());
+ user.setDisableRemark(dto.getRemark());
+ user.setOperatingTime(LocalDateTime.now());
+ user.setOperatingPerson(loginUser.getNickName()+"("+loginUser.getUserName()+")");
return AjaxResult.success(userService.updateUserStatus(user));
}
--
Gitblit v1.7.1