diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceJs.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceJs.java index 7971e744..fc86ed5f 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceJs.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformEnhanceJs.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_js") @@ -18,9 +20,6 @@ public class OnlCgformEnhanceJs implements Serializable { private String cgJs; private String content; - public OnlCgformEnhanceJs() { - } - public String getId() { return this.id; } @@ -71,75 +70,88 @@ public class OnlCgformEnhanceJs implements Serializable { if (!var2.canEqual(this)) { return false; } else { - label71: { - String var3 = this.getId(); - String var4 = var2.getId(); - if (var3 == null) { - if (var4 == null) { - break label71; - } - } else if (var3.equals(var4)) { - break label71; - } - - 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; - } - - label57: { - String var7 = this.getCgJsType(); - String var8 = var2.getCgJsType(); - if (var7 == null) { - if (var8 == null) { - break label57; - } - } else if (var7.equals(var8)) { - break label57; - } - - return false; - } - - String var9 = this.getCgJs(); - String var10 = var2.getCgJs(); - if (var9 == null) { - if (var10 != null) { - return false; - } - } else if (!var9.equals(var10)) { - return false; - } - - String var11 = this.getContent(); - String var12 = var2.getContent(); - if (var11 == null) { - if (var12 == null) { - return true; - } - } else if (var11.equals(var12)) { - return true; - } - - return false; + return getBooleanReturn(var2); } } } + private boolean getBooleanReturn(OnlCgformEnhanceJs var2) { + Boolean x = getBoolean71(var2); + if (x != null) { + return x; + } + + if (getReturn(this.getCgformHeadId(), var2.getCgformHeadId())) { + return false; + } + + label57: { + String var7 = this.getCgJsType(); + String var8 = var2.getCgJsType(); + if (var7 == null) { + if (var8 == null) { + break label57; + } + } else if (var7.equals(var8)) { + break label57; + } + + return false; + } + + if (getReturn(this.getCgJs(), var2.getCgJs())) { + return false; + } + + String var11 = this.getContent(); + String var12 = var2.getContent(); + if (var11 == null) { + if (var12 == null) { + return true; + } + } else if (var11.equals(var12)) { + return true; + } + + return false; + } + + private boolean getReturn(String cgformHeadId, String cgformHeadId2) { + String var5 = cgformHeadId; + String var6 = cgformHeadId2; + if (var5 == null) { + if (var6 != null) { + return true; + } + } else if (!var5.equals(var6)) { + return true; + } + return false; + } + + @Nullable + private Boolean getBoolean71(OnlCgformEnhanceJs var2) { + label71: { + String var3 = this.getId(); + String var4 = var2.getId(); + if (var3 == null) { + if (var4 == null) { + break label71; + } + } else if (var3.equals(var4)) { + break label71; + } + + return false; + } + return null; + } + protected boolean canEqual(Object other) { return other instanceof OnlCgformEnhanceJs; } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getId(); int var8 = var2 * 59 + (var3 == null ? 43 : var3.hashCode());