From 95b507ca21a815310b7a586c3ea480df2b2070ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 20 Mar 2023 16:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91TreeModel=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../online/cgform/model/TreeModel.java        | 73 ++++++++-----------
 1 file changed, 30 insertions(+), 43 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java
index b36b3ec2..4e24557c 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java
@@ -1,6 +1,8 @@
 
 package com.jero.generater.modules.online.cgform.model;
 
+import java.util.Objects;
+
 public class TreeModel {
     private String label;
     private String store;
@@ -49,57 +51,42 @@ public class TreeModel {
         } else if (!(o instanceof TreeModel)) {
             return false;
         } else {
-            TreeModel var2 = (TreeModel)o;
-            if (!var2.canEqual(this)) {
+            return getTreeModel((TreeModel) o);
+        }
+    }
+
+    private boolean getTreeModel(TreeModel o) {
+        TreeModel var2 = o;
+        if (!var2.canEqual(this)) {
+            return false;
+        } else {
+            if (getReturn(this.getLabel(), var2.getLabel())) {
                 return false;
-            } else {
-                label59: {
-                    String var3 = this.getLabel();
-                    String var4 = var2.getLabel();
-                    if (var3 == null) {
-                        if (var4 == null) {
-                            break label59;
-                        }
-                    } else if (var3.equals(var4)) {
-                        break label59;
-                    }
+            }
 
-                    return false;
-                }
+            if (getReturn(this.getStore(), var2.getStore())) {
+                return false;
+            }
 
-                String var5 = this.getStore();
-                String var6 = var2.getStore();
-                if (var5 == null) {
-                    if (var6 != null) {
-                        return false;
-                    }
-                } else if (!var5.equals(var6)) {
-                    return false;
-                }
+            if (getReturn(this.getId(), var2.getId())) {
+                return false;
+            }
 
-                String var7 = this.getId();
-                String var8 = var2.getId();
-                if (var7 == null) {
-                    if (var8 != null) {
-                        return false;
-                    }
-                } else if (!var7.equals(var8)) {
-                    return false;
-                }
-
-                String var9 = this.getPid();
-                String var10 = var2.getPid();
-                if (var9 == null) {
-                    if (var10 != null) {
-                        return false;
-                    }
-                } else if (!var9.equals(var10)) {
-                    return false;
-                }
+            return !getReturn(this.getPid(), var2.getPid());
+        }
+    }
 
+    private boolean getReturn(String label, String label2) {
+        String var3 = label;
+        String var4 = label2;
+        if (var3 == null) {
+            if (var4 != null) {
                 return true;
             }
+        } else if (!Objects.equals(var3, var4)) {
+            return true;
         }
+        return false;
     }
 
     protected boolean canEqual(Object other) {