diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java index f1b59b37..64b800df 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.vo; +import java.util.Objects; + import lombok.Data; import lombok.experimental.Accessors; @@ -104,7 +106,7 @@ public class UserVO extends BaseVO { private Boolean disabled; public Boolean getDisabled() { - if (userId.equals(LoginHelper.getUserId())) { + if (Objects.equals(userId, LoginHelper.getUserId())) { return true; } return disabled; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index e98ded58..1fee35ee 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -114,7 +114,7 @@ public class DeptServiceImpl extends BaseServiceImpl