From 5f0c25f9bab848d7389de521670de178fb3e7f0b Mon Sep 17 00:00:00 2001
From: taoran1250 <543121890@qq.com>
Date: Tue, 17 Dec 2024 11:26:33 +0800
Subject: [PATCH] fix: bug fix && mybatis-plus update
---
.../manager/common/entity/persistence/PersistenceLabel.java | 6 +++++-
pom.xml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
index 1e2a645e29..9343668290 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
@@ -111,7 +111,11 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
int result = this.getLabelKey().hashCode();
- result = 31 * result + this.stringValue.hashCode();
+ String thisStringValue = getStringValue();
+ if (null == thisStringValue) {
+ return result;
+ }
+ result = 31 * result + thisStringValue.hashCode();
return result;
}
}
diff --git a/pom.xml b/pom.xml
index 4e0708a5bf..86b8263ae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
2.10.5
1.4.20
0.9.12
- 3.4.1
+ 3.5.7
8.0.28
1.1.22
3.27.0-GA