From 506468b88cdcb79812b61a434b9e549bbd56a50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 13 Mar 2023 14:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91OnlAuthPage?= =?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/auth/entity/OnlAuthPage.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthPage.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthPage.java index 8b206a37..702adefc 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthPage.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/entity/OnlAuthPage.java @@ -9,6 +9,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; @@ -138,64 +139,61 @@ public class OnlAuthPage implements Serializable { } Integer type2 = getType(); Integer type3 = onlAuthPage.getType(); - if (type2 != null ? !type2.equals(type3) : type3 != null) { + if (!Objects.equals(type2, type3)) { return false; } Integer control2 = getControl(); Integer control3 = onlAuthPage.getControl(); - if (control2 != null ? !control2.equals(control3) : control3 != null) { + if (!Objects.equals(control2, control3)) { return false; } Integer page2 = getPage(); Integer page3 = onlAuthPage.getPage(); - if (page2 != null ? !page2.equals(page3) : page3 != null) { + if (!Objects.equals(page2, page3)) { return false; } Integer status2 = getStatus(); Integer status3 = onlAuthPage.getStatus(); - if (status2 != null ? !status2.equals(status3) : status3 != null) { + if (!Objects.equals(status2, status3)) { return false; } String id2 = getId(); String id3 = onlAuthPage.getId(); - if (id2 != null ? !id2.equals(id3) : id3 != null) { + if (!Objects.equals(id2, id3)) { return false; } String cgformId2 = getCgformId(); String cgformId3 = onlAuthPage.getCgformId(); - if (cgformId2 != null ? !cgformId2.equals(cgformId3) : cgformId3 != null) { + if (!Objects.equals(cgformId2, cgformId3)) { return false; } String code2 = getCode(); String code3 = onlAuthPage.getCode(); - if (code2 != null ? !code2.equals(code3) : code3 != null) { + if (!Objects.equals(code2, code3)) { return false; } Date createTime2 = getCreateTime(); Date createTime3 = onlAuthPage.getCreateTime(); - if (createTime2 != null ? !createTime2.equals(createTime3) : createTime3 != null) { + if (!Objects.equals(createTime2, createTime3)) { return false; } String createBy2 = getCreateBy(); String createBy3 = onlAuthPage.getCreateBy(); - if (createBy2 != null ? !createBy2.equals(createBy3) : createBy3 != null) { + if (!Objects.equals(createBy2, createBy3)) { return false; } String updateBy2 = getUpdateBy(); String updateBy3 = onlAuthPage.getUpdateBy(); - if (updateBy2 != null ? !updateBy2.equals(updateBy3) : updateBy3 != null) { + if (!Objects.equals(updateBy2, updateBy3)) { return false; } Date updateTime2 = getUpdateTime(); Date updateTime3 = onlAuthPage.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() {