refactor(user): 调整用户 ID 类型和添加 phone 字段
- 前端用户 ID 类型从 number 改为 string,与后端保持一致 - 后端用户服务添加 phone 字段处理 - 更新权限相关代码以适配新的 ID 类型 - E2E 测试中添加 phone 字段
This commit is contained in:
+4
-1
@@ -4,6 +4,7 @@ import cn.novalon.gym.manage.common.util.StatusConstants;
|
||||
import cn.novalon.gym.manage.sys.core.domain.SysUser;
|
||||
import cn.novalon.gym.manage.sys.core.domain.SysRole;
|
||||
import cn.novalon.gym.manage.sys.core.domain.UserRole;
|
||||
import cn.novalon.gym.manage.sys.core.query.SysUserQuery;
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.sys.core.repository.ISysUserRepository;
|
||||
@@ -80,7 +81,9 @@ public class SysUserService implements ISysUserService {
|
||||
|
||||
@Override
|
||||
public Mono<PageResponse<SysUser>> findUsersByPage(PageRequest pageRequest) {
|
||||
return userRepository.findByQueryWithPagination(null, pageRequest);
|
||||
SysUserQuery query = new SysUserQuery();
|
||||
query.setKeyword(pageRequest.getKeyword());
|
||||
return userRepository.findByQueryWithPagination(query, pageRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+13
-3
@@ -1,15 +1,25 @@
|
||||
package cn.novalon.gym.manage.sys.dto.request;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class AssignRolesRequest {
|
||||
private List<Long> roleIds;
|
||||
private List<String> roleIds;
|
||||
|
||||
public List<Long> getRoleIds() {
|
||||
public List<String> getRoleIds() {
|
||||
return roleIds;
|
||||
}
|
||||
|
||||
public void setRoleIds(List<Long> roleIds) {
|
||||
public void setRoleIds(List<String> roleIds) {
|
||||
this.roleIds = roleIds;
|
||||
}
|
||||
|
||||
public List<Long> getRoleIdsAsLong() {
|
||||
if (roleIds == null) {
|
||||
return null;
|
||||
}
|
||||
return roleIds.stream()
|
||||
.map(Long::valueOf)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -63,6 +63,10 @@ public class SysUserHandler {
|
||||
String order = request.queryParam("order").orElse("asc");
|
||||
String keyword = request.queryParam("keyword").orElse(null);
|
||||
|
||||
System.out.println("=== SysUserHandler.getUsersByPage ===");
|
||||
System.out.println("page: " + page + ", size: " + size + ", sort: " + sort + ", order: " + order);
|
||||
System.out.println("keyword: " + keyword);
|
||||
|
||||
PageRequest pageRequest = new PageRequest();
|
||||
pageRequest.setPage(page);
|
||||
pageRequest.setSize(size);
|
||||
@@ -259,7 +263,7 @@ public class SysUserHandler {
|
||||
public Mono<ServerResponse> assignRoles(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(AssignRolesRequest.class)
|
||||
.flatMap(req -> userService.assignRolesToUser(id, req.getRoleIds()))
|
||||
.flatMap(req -> userService.assignRolesToUser(id, req.getRoleIdsAsLong()))
|
||||
.then(ServerResponse.ok().build())
|
||||
.onErrorResume(error -> {
|
||||
logger.error("分配角色失败", error);
|
||||
|
||||
Reference in New Issue
Block a user