From 33831a45353e154616402735a4cae5a57a5309b5 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 29 Apr 2026 21:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=89=8B=E4=B8=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 16a33b1ef5551eaeeba349addd896ed64b54d539) --- .../app/command/user/query/UserCpPairUserProfileQryExe.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpPairUserProfileQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpPairUserProfileQryExe.java index e3c439a6..4da1e947 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpPairUserProfileQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/query/UserCpPairUserProfileQryExe.java @@ -45,12 +45,12 @@ public class UserCpPairUserProfileQryExe { ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, meUser); List cpList = cpRelationshipCacheService.getUserCpList(cmd.requiredReqUserId()); - if (cpList.isEmpty()) { + List dismissing = cpRelationshipService.getDismissingByUserId(cmd.requiredReqUserId()); + + if (cpList.isEmpty() && dismissing.isEmpty()) { return Collections.emptyList(); } - List dismissing = cpRelationshipService.getDismissingByUserId(cmd.requiredReqUserId()); - UserProfileDTO meUserProfileDTO = userProfileAppConvertor.toSimpleUserProfileDTO(meUser); // 已在 cpList 中的 cpUserId（NORMAL），避免 dismissing 重复追加