From da5277543cca4c6eb8590f37d5bd12821d78fe5c Mon Sep 17 00:00:00 2001
From: Xusan <1105644308@QQ.COM>
Date: Wed, 22 May 2024 14:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../whdc/controller/AddressBookController.java | 18 +++++++++---------
 .../java/com/whdc/service/IUserService.java    |  2 +-
 .../com/whdc/service/impl/UserServiceImpl.java |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java
index 1042a08..cbd0323 100644
--- a/src/main/java/com/whdc/controller/AddressBookController.java
+++ b/src/main/java/com/whdc/controller/AddressBookController.java
@@ -78,9 +78,9 @@ public class AddressBookController {
     @ApiOperation(value = "添加")
     @PostMapping(value = "save")
     public ResultJson insert(@RequestBody @Validated(Insert.class) AddressBook model) {
-        String role = userService.getRole(Integer.valueOf(String.valueOf(StpUtil.getLoginId())));
+        User user = userService.getRole(Integer.valueOf(String.valueOf(StpUtil.getLoginId())));
 
-        switch (Objects.requireNonNull(Role.getByName(role))) {
+        switch (Objects.requireNonNull(Role.getByName(user.getRole()))) {
             case R000:return ResultJson.error("权限不足");
             case R001:
             case R099:break;
@@ -137,12 +137,12 @@ public class AddressBookController {
     public ResultJson update(@RequestBody @Validated(Update.class) AddressBook model) {
 
         Integer loginId = Integer.valueOf(String.valueOf(StpUtil.getLoginId()));
-        String role = userService.getRole(loginId);
+        User user = userService.getRole(loginId);
 
-        switch (Objects.requireNonNull(Role.getByName(role))) {
+        switch (Objects.requireNonNull(Role.getByName(user.getRole()))) {
             case R000:{
                 // 不是修改自己
-                if (!model.getId().equals(loginId)){
+                if (!model.getId().equals(user.getAbId())){
                     return ResultJson.error("权限不足");
                 }
             };
@@ -242,9 +242,9 @@ public class AddressBookController {
     public ResultJson updateRole(@RequestBody @Validated(Update.class) User model) {
 
         Integer loginId = Integer.valueOf(String.valueOf(StpUtil.getLoginId()));
-        String role = userService.getRole(loginId);
+        User user = userService.getRole(loginId);
 
-        switch (Objects.requireNonNull(Role.getByName(role))) {
+        switch (Objects.requireNonNull(Role.getByName(user.getRole()))) {
             case R000:
             case R001: return ResultJson.error("权限不足");
             case R099:break;
@@ -288,9 +288,9 @@ public class AddressBookController {
     public ResultJson delete(@PathVariable("id") Integer id) {
 
         Integer loginId = Integer.valueOf(String.valueOf(StpUtil.getLoginId()));
-        String role = userService.getRole(loginId);
+        User user = userService.getRole(loginId);
 
-        switch (Objects.requireNonNull(Role.getByName(role))) {
+        switch (Objects.requireNonNull(Role.getByName(user.getRole()))) {
             case R000:
             case R001: return ResultJson.error("权限不足");
             case R099:break;
diff --git a/src/main/java/com/whdc/service/IUserService.java b/src/main/java/com/whdc/service/IUserService.java
index 7b8acf6..5795a1f 100644
--- a/src/main/java/com/whdc/service/IUserService.java
+++ b/src/main/java/com/whdc/service/IUserService.java
@@ -29,7 +29,7 @@ public interface IUserService extends IService<User> {
 
     boolean register(User entity);
 
-    String getRole(Integer id);
+    User getRole(Integer id);
 
     boolean register(String phone, Integer abId, String role);
 
diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java
index a899e65..b5c5e54 100644
--- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java
@@ -114,14 +114,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public String getRole(Integer id) {
+    public User getRole(Integer id) {
 
         User byId = this.getById(id);
         if (byId == null){
             throw new MyException("该用户不存在");
         }
 
-        return byId.getRole();
+        return byId;
     }
 
     @Override