From 67ae05ff3cdbb8179a333ddae25b893689b72dfd 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 11:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91OnlForeignKey?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../online/cgform/model/OnlForeignKey.java    | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlForeignKey.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlForeignKey.java
index efba3a19..13b92373 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlForeignKey.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlForeignKey.java
@@ -1,6 +1,8 @@
 
 package com.jero.generater.modules.online.cgform.model;
 
+import java.util.Objects;
+
 public class OnlForeignKey {
     private String a;
     private String b;
@@ -48,51 +50,50 @@ public class OnlForeignKey {
             if (!var2.a(this)) {
                 return false;
             } else {
-                label47: {
-                    String var3 = this.getField();
-                    String var4 = var2.getField();
-                    if (var3 == null) {
-                        if (var4 == null) {
-                            break label47;
-                        }
-                    } else if (var3.equals(var4)) {
-                        break label47;
-                    }
-
-                    return false;
-                }
-
-                String var5 = this.getTable();
-                String var6 = var2.getTable();
-                if (var5 == null) {
-                    if (var6 != null) {
-                        return false;
-                    }
-                } else if (!var5.equals(var6)) {
-                    return false;
-                }
-
-                String var7 = this.getKey();
-                String var8 = var2.getKey();
-                if (var7 == null) {
-                    if (var8 != null) {
-                        return false;
-                    }
-                } else if (!var7.equals(var8)) {
-                    return false;
-                }
-
-                return true;
+                return getOnlForeignKey(var2);
             }
         }
     }
 
+    private boolean getOnlForeignKey(OnlForeignKey var2) {
+        String var3 = this.getField();
+        String var4 = var2.getField();
+        if (var3 == null) {
+            if (var4 != null) {
+                return false;
+            }
+        } else if (!Objects.equals(var3,var4)) {
+            return false;
+        }
+
+        String var5 = this.getTable();
+        String var6 = var2.getTable();
+        if (var5 == null) {
+            if (var6 != null) {
+                return false;
+            }
+        } else if (!Objects.equals(var5,var6)) {
+            return false;
+        }
+
+        String var7 = this.getKey();
+        String var8 = var2.getKey();
+        if (var7 == null) {
+            if (var8 != null) {
+                return false;
+            }
+        } else if (!Objects.equals(var7,var8)) {
+            return false;
+        }
+
+        return true;
+    }
+
     protected boolean a(Object var1) {
         return var1 instanceof OnlForeignKey;
     }
 
     public int hashCode() {
-        boolean var1 = true;
         byte var2 = 1;
         String var3 = this.getField();
         int var6 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());