refactor:将Role对象替换为String类型以简化代码。
Some checks failed
代码检查 / 代码检查 (push) Failing after 20s

This commit is contained in:
筱锋xiao_lfeng 2024-04-15 16:17:06 +08:00
parent 102b900e55
commit 327f26fc30
No known key found for this signature in database
GPG Key ID: F693AA12AABBFA87
6 changed files with 6 additions and 18 deletions

View File

@ -9,5 +9,5 @@ public class UserAllCurrentVO {
private Long page; private Long page;
private Long limit; private Long limit;
private String search; private String search;
private Long role; private String role;
} }

View File

@ -25,16 +25,10 @@ public class UserCurrentBackVO {
@Accessors(chain = true) @Accessors(chain = true)
public static class UserCurrent { public static class UserCurrent {
private ReturnUser user; private ReturnUser user;
private ReturnUserRole role; private String role;
private List<String> permission; private List<String> permission;
} }
@Data
@Accessors(chain = true)
public static class ReturnUserRole {
private String name;
}
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public static class ReturnUser { public static class ReturnUser {

View File

@ -18,16 +18,10 @@ import java.util.List;
@Accessors(chain = true) @Accessors(chain = true)
public class UserReturnBackVO { public class UserReturnBackVO {
private ReturnUser user; private ReturnUser user;
private ReturnUserRole role; private String role;
private String token; private String token;
private List<String> permission; private List<String> permission;
@Data
@Accessors(chain = true)
public static class ReturnUserRole {
private String name;
}
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public static class ReturnUser { public static class ReturnUser {

View File

@ -296,7 +296,7 @@ public class AuthServiceImpl implements AuthService {
.setUsername(userDO.getUsername()) .setUsername(userDO.getUsername())
.setEmail(userDO.getEmail()) .setEmail(userDO.getEmail())
.setPhone(userDO.getPhone())) .setPhone(userDO.getPhone()))
.setRole(new UserReturnBackVO.ReturnUserRole().setName(getRoleString)) .setRole(getRoleString)
.setToken(token) .setToken(token)
.setPermission(getPermissionForString); .setPermission(getPermissionForString);
return ResultUtil.success("登陆成功", userReturnBackVO); return ResultUtil.success("登陆成功", userReturnBackVO);

View File

@ -124,7 +124,7 @@ public class UserServiceImpl implements UserService {
} }
// 检查是否存在 Role 筛选 // 检查是否存在 Role 筛选
if (userAllCurrentVO.getRole() != null) { if (userAllCurrentVO.getRole() != null) {
userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getName())); userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole()));
} }
return ResultUtil.success(userCurrentBackVO); return ResultUtil.success(userCurrentBackVO);
} }

View File

@ -328,7 +328,7 @@ public class Processing {
.setCreatedAt(userDO.getCreatedAt()) .setCreatedAt(userDO.getCreatedAt())
.setUpdatedAt(userDO.getUpdatedAt()) .setUpdatedAt(userDO.getUpdatedAt())
.setIsDelete(userDO.getIsDelete())) .setIsDelete(userDO.getIsDelete()))
.setRole(new UserCurrentBackVO.ReturnUserRole().setName(getRoleString)) .setRole(getRoleString)
.setPermission(getPermissionForString); .setPermission(getPermissionForString);
return userCurrent; return userCurrent;
} }