From dda2e3f49fe9c942fb6a487204ff8c8e66e46a12 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 18:08:14 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 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 c0bd686..2893952 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
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
@@ -10,10 +12,12 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
+import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.SysUserVO;
@@ -21,8 +25,7 @@
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.validation.annotation.Validated;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -49,13 +52,17 @@
private ISysDeptService deptService;
@Autowired
private TokenService tokenService;
+ @Autowired
+ private TProjectTeamService projectTeamService;
+ @Autowired
+ private TProjectTeamStaffService projectTeamStaffService;
/**
* 获取用户列表
*/
@ApiOperation(value = "获取用户列表")
@PostMapping("/system/user/list")
- @PreAuthorize("@ss.hasPermi('system:user')")
+// @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult list(@RequestBody SysUserQuery query)
{
PageInfo<SysUserVO> list = userService.pageList(query);
@@ -64,11 +71,35 @@
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/system/user/listNotPage")
- @PreAuthorize("@ss.hasPermi('system:user')")
-
+// @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult listNotPage()
{
List<SysUser> list = userService.selectList();
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation(value = "获取用户列表-不分页-根据角色筛选")
+ @GetMapping("/system/user/listByRole")
+ public AjaxResult listByRole(@RequestParam(value = "roleId",required = false) Long roleId,
+ @RequestParam(value = "nickName",required = false) String nickName)
+ {
+ // 获取当前用户项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ List<TProjectTeamStaff> staffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if (CollectionUtils.isEmpty(staffs)){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List<String> teamIds = staffs.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
+ LambdaQueryWrapper<TProjectTeamStaff> wrapper = new LambdaQueryWrapper<>();
+ if(Objects.nonNull(roleId)){
+ wrapper.eq(TProjectTeamStaff::getRoleType,Integer.parseInt(roleId.toString()));
+ }
+ wrapper.in(TProjectTeamStaff::getTeamId, teamIds);
+ List<TProjectTeamStaff> teamStaffs = projectTeamStaffService.list(wrapper);
+ List<Long> userIds = teamStaffs.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
+
+ List<SysUser> list = userService.listByRole(userIds,nickName);
return AjaxResult.success(list);
}
@@ -170,7 +201,39 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword("123456"));
+ user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
+ user.setUserIdentification(CodeGenerateUtils.generateVolumeSn());
userService.insertUser(user);
+ return R.ok();
+ }
+
+ /**
+ * 账号继承
+ */
+ // @PreAuthorize("@ss.hasPermi('system:user:add')")
+ @ApiOperation(value = "账号继承,userId:继承账号id,oldUserId:老账号id",response = SysUser.class)
+ @Log(title = "用户信息-账号继承", businessType = BusinessType.UPDATE)
+ @PutMapping("/open/system/user/inherit")
+ public R<String> inherit(@RequestParam Long userId,
+ @RequestParam Long oldUserId)
+ {
+ // 查询老帐号
+ SysUser oldUser = userService.selectUserById(oldUserId);
+ if (Objects.isNull(oldUser)){
+ return R.fail("原始账号不存在");
+ }
+ SysUser user = userService.selectUserById(userId);
+ if (Objects.isNull(user)){
+ return R.fail("继承账号不存在");
+ }
+ Long oldUserUserId = oldUser.getUserId();
+ List<SysUser> oldUserList = userService.selectOldList();
+// oldUser.setUserId();
+// userService.updateUserOldUser(oldUser);
+ user.setParentId(oldUser.getUserId());
+ user.setParentAccount(oldUser.getUserName());
+
+// userService.updateUserInherit(user);
return R.ok();
}
@@ -200,10 +263,26 @@
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
+ user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
return R.ok(userService.updateUser(user));
}
/**
+ * 修改用户签名
+ */
+ // @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @ApiOperation(value = "修改用户签名")
+ @Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
+ @PostMapping("/api/system/user/editSignPicture")
+ public R editSignPicture(@RequestBody String param)
+ {
+ Long userId = tokenService.getLoginUser().getUserId();
+ SysUser user = JSON.parseObject(param,SysUser.class);
+ user.setUserId(userId);
+ return R.ok(userService.editSignPicture(user));
+ }
+
+ /**
* 删除用户
*/
// @PreAuthorize("@ss.hasPermi('system:user:remove')")
--
Gitblit v1.7.1