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 45367d2d..b0ddc3ff 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 @@ -4,6 +4,8 @@ package com.jero.generater.modules.online.cgform.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import org.jetbrains.annotations.Nullable; + import java.io.Serializable; @TableName("onl_cgform_enhance_sql") @@ -19,9 +21,6 @@ public class OnlCgformEnhanceSql implements Serializable { private String cgbSqlName; private String content; - public OnlCgformEnhanceSql() { - } - public String getId() { return this.id; } @@ -80,85 +79,86 @@ public class OnlCgformEnhanceSql implements Serializable { if (!var2.canEqual(this)) { return false; } else { - String var3 = this.getId(); - String var4 = var2.getId(); - if (var3 == null) { - if (var4 != null) { - return false; - } - } else if (!var3.equals(var4)) { - return false; - } - - String var5 = this.getCgformHeadId(); - String var6 = var2.getCgformHeadId(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } - - String var7 = this.getButtonCode(); - String var8 = var2.getButtonCode(); - if (var7 == null) { - if (var8 != null) { - return false; - } - } else if (!var7.equals(var8)) { - return false; - } - - label62: { - String var9 = this.getCgbSql(); - String var10 = var2.getCgbSql(); - if (var9 == null) { - if (var10 == null) { - break label62; - } - } else if (var9.equals(var10)) { - break label62; - } - - return false; - } - - label55: { - String var11 = this.getCgbSqlName(); - String var12 = var2.getCgbSqlName(); - if (var11 == null) { - if (var12 == null) { - break label55; - } - } else if (var11.equals(var12)) { - break label55; - } - - return false; - } - - String var13 = this.getContent(); - String var14 = var2.getContent(); - if (var13 == null) { - if (var14 != null) { - return false; - } - } else if (!var13.equals(var14)) { - return false; - } - - return true; + return getBooleanReturn(var2); } } } + private boolean getBooleanReturn(OnlCgformEnhanceSql var2) { + if (getReturn(this.getId(), var2.getId())) { + return false; + } + + if (getReturn(this.getCgformHeadId(), var2.getCgformHeadId())) { + return false; + } + + if (getReturn(this.getButtonCode(), var2.getButtonCode())) { + return false; + } + + Boolean x = getBoolean62(var2); + if (x != null) { + 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; + } + + return false; + } + + if (getReturn(this.getContent(), var2.getContent())) { + return false; + } + + return true; + } + + @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; + } + + return false; + } + return null; + } + + private boolean getReturn(String id, String id2) { + String var3 = id; + String var4 = id2; + if (var3 == null) { + if (var4 != null) { + return true; + } + } else if (!var3.equals(var4)) { + return true; + } + return false; + } + protected boolean canEqual(Object other) { return other instanceof OnlCgformEnhanceSql; } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getId(); int var9 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());