From 4071bb7f6745bbe5411c68a24c8adb44b8f69266 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 25 Feb 2023 14:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E9=83=A8=E5=88=86=20equals()=20=E7=94=A8=E6=B3=95=E4=B8=BA=20O?=
=?UTF-8?q?bjects.equals()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/top/charles7c/cnadmin/system/model/vo/UserVO.java | 4 +++-
.../cnadmin/system/service/impl/DeptServiceImpl.java | 2 +-
.../cnadmin/system/service/impl/MenuServiceImpl.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
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<DeptMapper, DeptDO, DeptVO,
boolean flag = true;
for (DeptVO inner : list) {
// 忽略重复子列表
- if (inner.getDeptId().equals(outer.getParentId())) {
+ if (Objects.equals(inner.getDeptId(), outer.getParentId())) {
flag = false;
break;
}
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
index a5ec17aa..b1542460 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
@@ -105,7 +105,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuVO,
boolean flag = true;
for (MenuVO inner : list) {
// 忽略重复子列表
- if (inner.getMenuId().equals(outer.getParentId())) {
+ if (Objects.equals(inner.getMenuId(), outer.getParentId())) {
flag = false;
break;
}