From 0b242c63ddc1a5675b8d9b9ba4c56bd0ec2d878c 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:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91AuthPageVO?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/online/auth/vo/AuthPageVO.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/vo/AuthPageVO.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/vo/AuthPageVO.java index 4adb9288..2e2a8f9d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/vo/AuthPageVO.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/vo/AuthPageVO.java @@ -1,6 +1,7 @@ package com.jero.generater.modules.online.auth.vo; import java.io.Serializable; +import java.util.Objects; public class AuthPageVO implements Serializable { private static final long serialVersionUID = 724713901683956568L; @@ -30,44 +31,41 @@ public class AuthPageVO implements Serializable { } Integer page2 = getPage(); Integer page3 = authPageVO.getPage(); - if (page2 != null ? !page2.equals(page3) : page3 != null) { + if (!Objects.equals(page2, page3)) { return false; } Integer control2 = getControl(); Integer control3 = authPageVO.getControl(); - if (control2 != null ? !control2.equals(control3) : control3 != null) { + if (!Objects.equals(control2, control3)) { return false; } Boolean checked2 = getChecked(); Boolean checked3 = authPageVO.getChecked(); - if (checked2 != null ? !checked2.equals(checked3) : checked3 != null) { + if (!Objects.equals(checked2, checked3)) { return false; } String id2 = getId(); String id3 = authPageVO.getId(); - if (id2 != null ? !id2.equals(id3) : id3 != null) { + if (!Objects.equals(id2, id3)) { return false; } String code2 = getCode(); String code3 = authPageVO.getCode(); - if (code2 != null ? !code2.equals(code3) : code3 != null) { + if (!Objects.equals(code2, code3)) { return false; } String title2 = getTitle(); String title3 = authPageVO.getTitle(); - if (title2 != null ? !title2.equals(title3) : title3 != null) { + if (!Objects.equals(title2, title3)) { return false; } String relId2 = getRelId(); String relId3 = authPageVO.getRelId(); if (relId2 == null) { - if (relId3 == null) { - return true; - } - } else if (relId2.equals(relId3)) { - return true; + return relId3 == null; + } else { + return relId2.equals(relId3); } - return false; } public int hashCode() {