From d7f910fb8b65dc68642c352dbfa20bb38c02e579 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Jun 2024 15:03:57 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=A4=84=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/biz/login/LoginInfo.java | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java index 4be3e01f95..735913ec26 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java @@ -1,5 +1,7 @@ package com.mogo.och.common.module.biz.login; +import java.util.Objects; + public class LoginInfo { private int driverStatus; //1登录，0登出 private int servingStatus;//1接单中，0暂停接单 @@ -169,17 +171,23 @@ public class LoginInfo { if (servingStatus != loginInfo.servingStatus) return false; if (businessType != loginInfo.businessType) return false; if (purpose != loginInfo.purpose) return false; - if (!orderNo.equals(loginInfo.orderNo)) return false; - if (!sn.equals(loginInfo.sn)) return false; - if (!plateNumber.equals(loginInfo.plateNumber)) return false; - if (!phone.equals(loginInfo.phone)) return false; - if (!lineId.equals(loginInfo.lineId)) return false; - if (!taskId.equals(loginInfo.taskId)) return false; - if (!vin.equals(loginInfo.vin)) return false; - if (!cityCode.equals(loginInfo.cityCode)) return false; - if (!brand.equals(loginInfo.brand)) return false; - if (!carModel.equals(loginInfo.carModel)) return false; - return photos.equals(loginInfo.photos); + if (!Objects.equals(orderNo, loginInfo.orderNo)) + return false; + if (!Objects.equals(sn, loginInfo.sn)) return false; + if (!Objects.equals(plateNumber, loginInfo.plateNumber)) + return false; + if (!Objects.equals(phone, loginInfo.phone)) return false; + if (!Objects.equals(lineId, loginInfo.lineId)) + return false; + if (!Objects.equals(taskId, loginInfo.taskId)) + return false; + if (!Objects.equals(vin, loginInfo.vin)) return false; + if (!Objects.equals(cityCode, loginInfo.cityCode)) + return false; + if (!Objects.equals(brand, loginInfo.brand)) return false; + if (!Objects.equals(carModel, loginInfo.carModel)) + return false; + return Objects.equals(photos, loginInfo.photos); } @Override @@ -187,18 +195,18 @@ public class LoginInfo { int result = driverStatus; result = 31 * result + servingStatus; result = 31 * result + businessType; - result = 31 * result + orderNo.hashCode(); + result = 31 * result + (orderNo != null ? orderNo.hashCode() : 0); result = 31 * result + purpose; - result = 31 * result + sn.hashCode(); - result = 31 * result + plateNumber.hashCode(); - result = 31 * result + phone.hashCode(); - result = 31 * result + lineId.hashCode(); - result = 31 * result + taskId.hashCode(); - result = 31 * result + vin.hashCode(); - result = 31 * result + cityCode.hashCode(); - result = 31 * result + brand.hashCode(); - result = 31 * result + carModel.hashCode(); - result = 31 * result + photos.hashCode(); + result = 31 * result + (sn != null ? sn.hashCode() : 0); + result = 31 * result + (plateNumber != null ? plateNumber.hashCode() : 0); + result = 31 * result + (phone != null ? phone.hashCode() : 0); + result = 31 * result + (lineId != null ? lineId.hashCode() : 0); + result = 31 * result + (taskId != null ? taskId.hashCode() : 0); + result = 31 * result + (vin != null ? vin.hashCode() : 0); + result = 31 * result + (cityCode != null ? cityCode.hashCode() : 0); + result = 31 * result + (brand != null ? brand.hashCode() : 0); + result = 31 * result + (carModel != null ? carModel.hashCode() : 0); + result = 31 * result + (photos != null ? photos.hashCode() : 0); return result; } }