From e1e74a6e6f07ff07141bd177bf683971673ede1f Mon Sep 17 00:00:00 2001 From: yanglin Date: Mon, 13 Jan 2025 19:33:38 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3502:=20=E5=A4=84=E7=90=86=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=87=8D=E5=A4=8D=E5=8F=91=E9=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/msg/center/service/dto/PeerPerson.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PeerPerson.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PeerPerson.java index 8ac6f9d5..c08e0697 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PeerPerson.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PeerPerson.java @@ -1,16 +1,15 @@ package cn.axzo.msg.center.service.dto; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.Objects; + /** * @author yanglin */ @Setter @Getter -// 不要删除这个注解 -@EqualsAndHashCode public class PeerPerson { public static PeerPerson nonPerson() { @@ -50,6 +49,18 @@ public class PeerPerson { */ private Long workspaceId = 0L; + @Override + public boolean equals(Object o) { + if (!(o instanceof PeerPerson)) return false; + PeerPerson person = (PeerPerson) o; + return Objects.equals(personId, person.personId) && Objects.equals(ouId, person.ouId); + } + + @Override + public int hashCode() { + return Objects.hash(personId, ouId); + } + public Long getPersonIdOrDefault() { return personId == null ? 0L : personId; }