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 { 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 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