From 7937ee8b571847a6a7a26e1943f2bd8c73df5a5f Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 6 Feb 2025 16:48:05 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3345:=20=E6=B7=BB=E5=8A=A0=E9=99=90?= =?UTF-8?q?=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/im/center/api/vo/PersonAccountAttribute.java | 4 ++++ .../src/main/java/cn/axzo/im/service/domain/ImAccounts.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/PersonAccountAttribute.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/PersonAccountAttribute.java index 27ff894..c490e93 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/PersonAccountAttribute.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/PersonAccountAttribute.java @@ -71,6 +71,10 @@ public class PersonAccountAttribute { } public Long ouIdOrDefault() { + return getOuIdOrDefault(ouId); + } + + public static Long getOuIdOrDefault(Long ouId) { return ouId == null ? 0L : ouId; } diff --git a/im-center-server/src/main/java/cn/axzo/im/service/domain/ImAccounts.java b/im-center-server/src/main/java/cn/axzo/im/service/domain/ImAccounts.java index ad24833..24f60ba 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/domain/ImAccounts.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/domain/ImAccounts.java @@ -72,7 +72,7 @@ public class ImAccounts { private static boolean isAccountMatchPerson(PersonAccountAttribute person, AccountRegister account) { return person.getPersonId().equals(account.getAccountId()) && person.getAppType().getCode().equals(account.getAppType()) - && Objects.equals(person.getOuId(), account.getOuId()); + && Objects.equals(person.ouIdOrDefault(), PersonAccountAttribute.getOuIdOrDefault(account.getOuId())); } } \ No newline at end of file