zzx/yjearth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
ZZX9599
2025-10-22 17:26:11 +08:00
parent 663235eb7e
commit 6b9aef1acd
8 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/yj/earth/business/controller/UserController.java
View File

@ -47,10 +47,6 @@ public class UserController {
}
String password = user.getPassword();
user.setPassword(BCrypt.hashpw(password, BCrypt.gensalt()));
if (addUserDto.getRoleId() == null) {
// 查询系统名字为默认角色的角色ID
user.setRoleId(roleService.getOne(new LambdaQueryWrapper<Role>().eq(Role::getRoleName, "默认角色")).getId());
}
userService.save(user);
return ApiResponse.success(null);
}
@ -91,16 +87,21 @@ public class UserController {
public ApiResponse list(@Parameter(description = "分页数量") Integer pageNum,
@Parameter(description = "分页大小") Integer pageSize,
@Parameter(description = "搜索字段") String searchKey,
@Parameter(description = "角色ID") String roleId) {
@Parameter(description = "角色ID") String roleId,
@Parameter(description = "用户状态") Integer status) {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
// 根据用户名或者昵称进行模糊搜索
if (StringUtils.isNotBlank(searchKey)) {
wrapper.like(User::getUsername, searchKey).or().like(User::getNickname, searchKey);
wrapper.nested(q -> q.like(User::getUsername, searchKey).or().like(User::getNickname, searchKey));
}
// 根据角色ID等值搜索
if (StringUtils.isNotBlank(roleId)) {
wrapper.eq(User::getRoleId, roleId);
}
// 角色状态处理
if (status != null) {
wrapper.eq(User::getStatus, status);
}
Page<User> userPage = userService.page(new Page<>(pageNum, pageSize), wrapper);
return ApiResponse.success(userPage);
}
@ -154,7 +155,7 @@ public class UserController {
@Operation(summary = "删除用户")
@PostMapping("/deletes")
@RoleAccess(roleNames = "管理员")
public ApiResponse deletes(@RequestBody List<String> ids) {
public ApiResponse deletes(@Parameter(description = "用户ID列表") @RequestBody List<String> ids) {
userService.removeByIds(ids);
return ApiResponse.success(null);
}