From 1e2dc58adc5bdf7b17b3f75eefc55a1aa914b6cf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 11:44:03 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 149 +++++--------------------------------------------
1 files changed, 15 insertions(+), 134 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 3475998..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();
@@ -79,105 +84,6 @@
// startPage(query.getPageNum(), query.getPageSize());
// List<SysUserVO> list = userService.selectBlackPageList(query);
// return AjaxResult.success(getDataTable(list));
-// }
-
- /**
- * 人员借用列表
- */
-// @ApiOperation(value = "人员借用列表")
-// @GetMapping("/userBorrowList")
-// public AjaxResult userBorrowList(@RequestParam(required = false) String name,
-// @RequestParam(required = false) Integer type)
-// {
-//
-// UserAddListVO userAddListVO = new UserAddListVO();
-//
-// Long companyId = tokenService.getLoginUser().getUser().getCompanyId();
-//
-// List<TCompany> companyList = new ArrayList<>();
-// List<TDept> deptList = new ArrayList<>();
-// List<SysUser> userList = new ArrayList<>();
-// // 查询公司
-// if(Objects.nonNull(type) && type == 1){
-// companyList = companyService.userAddListByCompanyName(name);
-// }
-// // 查询部门
-// if(Objects.nonNull(type) && type == 2){
-// deptList = tDeptService.userAddListByDeptName(name);
-// }
-// // 查询用户
-// if(Objects.nonNull(type) && type == 3){
-// userList = userService.selectListByNamePhone(name);
-// }
-//
-// if(Objects.isNull(type)){
-// companyList = companyService.userAddListByCompanyName(name);
-// deptList = tDeptService.userAddListByDeptName(name);
-// userList = userService.selectListByNamePhone(name);
-// }
-//
-// List<Long> companyIds = companyList.stream().map(TCompany::getId).collect(Collectors.toList());
-// List<Long> deptCompanyIds = deptList.stream().map(TDept::getCompanyId).collect(Collectors.toList());
-// List<Long> userCompanyIds = userList.stream().map(SysUser::getCompanyId).collect(Collectors.toList());
-// companyIds.addAll(deptCompanyIds);
-// companyIds.addAll(userCompanyIds);
-//
-// companyIds = companyIds.stream().distinct().collect(Collectors.toList());
-//
-// if(CollectionUtils.isEmpty(companyIds)){
-// return AjaxResult.success(userAddListVO);
-// }
-// SysUser user1 = tokenService.getLoginUser().getUser();
-// if(!user1.isAdmin()){
-// companyIds = companyIds.stream().filter(e->!e.equals(companyId)).collect(Collectors.toList());
-// }
-//
-// // 查询符合要求的公司
-// List<UserLevelVO> parent = companyService.userAddListByCompanyIds(companyIds);
-//
-// List<TDept> depts = tDeptService.selectList();
-//
-// List<SysUser> sysUsers = userService.selectList();
-//
-// for (UserLevelVO userLevelVO : parent) {
-//
-// // 找到公司下的部门
-// List<TDept> tDepts = depts.stream().filter(e -> userLevelVO.getKey().equals(e.getCompanyId())).collect(Collectors.toList());
-// List<UserLevelVO> children = new ArrayList<>();
-// // 封装部门
-// for (TDept dept : tDepts) {
-// userLevelVO.setChildren(children);
-// UserLevelVO userLevelVO1 = new UserLevelVO();
-// userLevelVO1.setKey(dept.getId());
-// userLevelVO1.setTitle(dept.getDeptName());
-// // 找到部门下的人员
-// List<SysUser> users;
-// if(StringUtils.isNotEmpty(name) && type == 3){
-// users = sysUsers.stream().filter(e -> userLevelVO1.getKey().equals(e.getDeptId())
-// && ((StringUtils.isNotEmpty(e.getNickName()) && e.getNickName().contains(name)))
-// || (StringUtils.isNotEmpty(e.getPhonenumber()) && e.getPhonenumber().contains(name))).collect(Collectors.toList());
-// }else {
-// users = sysUsers.stream().filter(e -> userLevelVO1.getKey().equals(e.getDeptId())).collect(Collectors.toList());
-// }
-// List<UserLevelVO> children1 = new ArrayList<>();
-// // 封装人员
-// for (SysUser user : users) {
-// UserLevelVO userLevelVO2 = new UserLevelVO();
-// userLevelVO2.setKey(user.getUserId());
-// userLevelVO2.setTitle(user.getNickName());
-// userLevelVO2.setAvatar(user.getAvatar());
-// userLevelVO2.setFlag(true);
-// children1.add(userLevelVO2);
-// }
-// userLevelVO1.setChildren(children1);
-//
-// children.add(userLevelVO1);
-// }
-// userLevelVO.setChildren(children);
-// }
-// userAddListVO.setUserLevelVOS(parent);
-// userAddListVO.setUserList(sysUsers);
-// return AjaxResult.success(userAddListVO);
// }
/**
@@ -245,37 +151,6 @@
return AjaxResult.success();
}
-
-// @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-//// // @PreAuthorize("@ss.hasPermi('system:user:export')")
-// @PostMapping("/export")
-// public void export(HttpServletResponse response, SysUser user)
-// {
-// List<SysUser> list = userService.selectUserList(user);
-// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-// util.exportExcel(response, list, "用户数据");
-// }
-
-// @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-//// // @PreAuthorize("@ss.hasPermi('system:user:import')")
-// @PostMapping("/importData")
-// public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-// {
-// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-// List<SysUser> userList = util.importExcel(file.getInputStream());
-// String operName = getUsername();
-// String message = userService.importUser(userList, updateSupport, operName);
-// return AjaxResult.success(message);
-// }
-
-// @PostMapping("/importTemplate")
-// public void importTemplate(HttpServletResponse response)
-// {
-// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-// util.importTemplateExcel(response, "用户数据");
-// }
-
-
/**
* 新增用户
*/
@@ -285,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() + "'失败，登录账号已存在");
@@ -295,7 +170,7 @@
return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setCreateBy(getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword("123456"));
userService.insertUser(user);
return AjaxResult.success();
}
@@ -322,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));
}
@@ -371,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