From 31342fea848e274da5300cc7c8b5abd43de2bf5c 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:45:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91OnlCgformEnhanceSq?=
 =?UTF-8?q?l=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgform/entity/OnlCgformEnhanceSql.java    | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceSql.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceSql.java
index b0ddc3ff..24faf091 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceSql.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceSql.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 @TableName("onl_cgform_enhance_sql")
 public class OnlCgformEnhanceSql implements Serializable {
@@ -102,40 +103,28 @@ public class OnlCgformEnhanceSql implements Serializable {
             return x;
         }
 
-        label55: {
-            String var11 = this.getCgbSqlName();
-            String var12 = var2.getCgbSqlName();
-            if (var11 == null) {
-                if (var12 == null) {
-                    break label55;
-                }
-            } else if (var11.equals(var12)) {
-                break label55;
+        String var11 = this.getCgbSqlName();
+        String var12 = var2.getCgbSqlName();
+        if (var11 == null) {
+            if (var12 != null) {
+                return false;
             }
-
+        } else if (!Objects.equals(var11,var12)) {
             return false;
         }
 
-        if (getReturn(this.getContent(), var2.getContent())) {
-            return false;
-        }
-
-        return true;
+        return !getReturn(this.getContent(), var2.getContent());
     }
 
     @Nullable
     private Boolean getBoolean62(OnlCgformEnhanceSql var2) {
-        label62: {
-            String var9 = this.getCgbSql();
-            String var10 = var2.getCgbSql();
-            if (var9 == null) {
-                if (var10 == null) {
-                    break label62;
-                }
-            } else if (var9.equals(var10)) {
-                break label62;
+        String var9 = this.getCgbSql();
+        String var10 = var2.getCgbSql();
+        if (var9 == null) {
+            if (var10 != null) {
+                return false;
             }
-
+        } else if (!Objects.equals(var9,var10)) {
             return false;
         }
         return null;