From 327f26fc30832e1d2579cd9a2a86634407336008 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Mon, 15 Apr 2024 16:17:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9A=E5=B0=86Role=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=9B=BF=E6=8D=A2=E4=B8=BAString=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BB=A5=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsl/oa/model/vodata/UserAllCurrentVO.java | 2 +- .../java/com/jsl/oa/model/vodata/UserCurrentBackVO.java | 8 +------- .../java/com/jsl/oa/model/vodata/UserReturnBackVO.java | 8 +------- .../java/com/jsl/oa/services/impl/AuthServiceImpl.java | 2 +- .../java/com/jsl/oa/services/impl/UserServiceImpl.java | 2 +- src/main/java/com/jsl/oa/utils/Processing.java | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java b/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java index 63b7eaf..a2e7538 100644 --- a/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java @@ -9,5 +9,5 @@ public class UserAllCurrentVO { private Long page; private Long limit; private String search; - private Long role; + private String role; } diff --git a/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java index 199ac08..a1d24b1 100755 --- a/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java @@ -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 permission; } - @Data - @Accessors(chain = true) - public static class ReturnUserRole { - private String name; - } - @Data @Accessors(chain = true) public static class ReturnUser { diff --git a/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java index 80bd69e..694da21 100755 --- a/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java @@ -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 permission; - @Data - @Accessors(chain = true) - public static class ReturnUserRole { - private String name; - } - @Data @Accessors(chain = true) public static class ReturnUser { diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java index abcf33c..697c9d3 100755 --- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java @@ -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); diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index ab7cda2..c25c4ed 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -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); } diff --git a/src/main/java/com/jsl/oa/utils/Processing.java b/src/main/java/com/jsl/oa/utils/Processing.java index 14a6d4f..b0d8546 100755 --- a/src/main/java/com/jsl/oa/utils/Processing.java +++ b/src/main/java/com/jsl/oa/utils/Processing.java @@ -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; }