This commit is contained in:
parent
102b900e55
commit
327f26fc30
|
@ -9,5 +9,5 @@ public class UserAllCurrentVO {
|
|||
private Long page;
|
||||
private Long limit;
|
||||
private String search;
|
||||
private Long role;
|
||||
private String role;
|
||||
}
|
||||
|
|
|
@ -25,16 +25,10 @@ public class UserCurrentBackVO {
|
|||
@Accessors(chain = true)
|
||||
public static class UserCurrent {
|
||||
private ReturnUser user;
|
||||
private ReturnUserRole role;
|
||||
private String role;
|
||||
private List<String> permission;
|
||||
}
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public static class ReturnUserRole {
|
||||
private String name;
|
||||
}
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public static class ReturnUser {
|
||||
|
|
|
@ -18,16 +18,10 @@ import java.util.List;
|
|||
@Accessors(chain = true)
|
||||
public class UserReturnBackVO {
|
||||
private ReturnUser user;
|
||||
private ReturnUserRole role;
|
||||
private String role;
|
||||
private String token;
|
||||
private List<String> permission;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public static class ReturnUserRole {
|
||||
private String name;
|
||||
}
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public static class ReturnUser {
|
||||
|
|
|
@ -296,7 +296,7 @@ public class AuthServiceImpl implements AuthService {
|
|||
.setUsername(userDO.getUsername())
|
||||
.setEmail(userDO.getEmail())
|
||||
.setPhone(userDO.getPhone()))
|
||||
.setRole(new UserReturnBackVO.ReturnUserRole().setName(getRoleString))
|
||||
.setRole(getRoleString)
|
||||
.setToken(token)
|
||||
.setPermission(getPermissionForString);
|
||||
return ResultUtil.success("登陆成功", userReturnBackVO);
|
||||
|
|
|
@ -124,7 +124,7 @@ public class UserServiceImpl implements UserService {
|
|||
}
|
||||
// 检查是否存在 Role 筛选
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -328,7 +328,7 @@ public class Processing {
|
|||
.setCreatedAt(userDO.getCreatedAt())
|
||||
.setUpdatedAt(userDO.getUpdatedAt())
|
||||
.setIsDelete(userDO.getIsDelete()))
|
||||
.setRole(new UserCurrentBackVO.ReturnUserRole().setName(getRoleString))
|
||||
.setRole(getRoleString)
|
||||
.setPermission(getPermissionForString);
|
||||
return userCurrent;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user