diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthData.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthData.java index a8903007..6b86d5c4 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthData.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthData.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; +import java.util.Objects; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -129,64 +130,61 @@ public class OnlAuthData implements Serializable { } Integer status2 = getStatus(); Integer status3 = onlAuthData.getStatus(); - if (status2 != null ? !status2.equals(status3) : status3 != null) { + if (!Objects.equals(status2, status3)) { return false; } String id2 = getId(); String id3 = onlAuthData.getId(); - if (id2 != null ? !id2.equals(id3) : id3 != null) { + if (!Objects.equals(id2, id3)) { return false; } String cgformId2 = getCgformId(); String cgformId3 = onlAuthData.getCgformId(); - if (cgformId2 != null ? !cgformId2.equals(cgformId3) : cgformId3 != null) { + if (!Objects.equals(cgformId2, cgformId3)) { return false; } String ruleName2 = getRuleName(); String ruleName3 = onlAuthData.getRuleName(); - if (ruleName2 != null ? !ruleName2.equals(ruleName3) : ruleName3 != null) { + if (!Objects.equals(ruleName2, ruleName3)) { return false; } String ruleColumn2 = getRuleColumn(); String ruleColumn3 = onlAuthData.getRuleColumn(); - if (ruleColumn2 != null ? !ruleColumn2.equals(ruleColumn3) : ruleColumn3 != null) { + if (!Objects.equals(ruleColumn2, ruleColumn3)) { return false; } String ruleOperator2 = getRuleOperator(); String ruleOperator3 = onlAuthData.getRuleOperator(); - if (ruleOperator2 != null ? !ruleOperator2.equals(ruleOperator3) : ruleOperator3 != null) { + if (!Objects.equals(ruleOperator2, ruleOperator3)) { return false; } String ruleValue2 = getRuleValue(); String ruleValue3 = onlAuthData.getRuleValue(); - if (ruleValue2 != null ? !ruleValue2.equals(ruleValue3) : ruleValue3 != null) { + if (!Objects.equals(ruleValue2, ruleValue3)) { return false; } Date createTime2 = getCreateTime(); Date createTime3 = onlAuthData.getCreateTime(); - if (createTime2 != null ? !createTime2.equals(createTime3) : createTime3 != null) { + if (!Objects.equals(createTime2, createTime3)) { return false; } String createBy2 = getCreateBy(); String createBy3 = onlAuthData.getCreateBy(); - if (createBy2 != null ? !createBy2.equals(createBy3) : createBy3 != null) { + if (!Objects.equals(createBy2, createBy3)) { return false; } String updateBy2 = getUpdateBy(); String updateBy3 = onlAuthData.getUpdateBy(); - if (updateBy2 != null ? !updateBy2.equals(updateBy3) : updateBy3 != null) { + if (!Objects.equals(updateBy2, updateBy3)) { return false; } Date updateTime2 = getUpdateTime(); Date updateTime3 = onlAuthData.getUpdateTime(); if (updateTime2 == null) { - if (updateTime3 == null) { - return true; - } - } else if (updateTime2.equals(updateTime3)) { - return true; + return updateTime3 == null; + } else { + return updateTime2.equals(updateTime3); } - return false; } public int hashCode() {