From 030449ab6af55eae7428ee808d47fb9b4f91ab67 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Tue, 3 Feb 2026 19:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=90=86=E6=94=BF=E7=AD=96-?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=88=9D=E5=A7=8B=E5=8C=96countryCode?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=A0=B9=E6=8D=AE=E5=9B=A2=E9=98=9F=E9=95=BF?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circle/other/infra/common/team/TeamTargetCommon.java    | 2 +-
 .../infra/common/team/decay/UpdateMemberTeamDecay.java      | 6 +++---
 .../service/team/impl/TeamBillCycleClientServiceImpl.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/TeamTargetCommon.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/TeamTargetCommon.java
index eee1a101..0b498e21 100644
--- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/TeamTargetCommon.java
+++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/TeamTargetCommon.java
@@ -130,7 +130,7 @@ public class TeamTargetCommon {
           Boolean.FALSE);
     }
 
-    UserProfile userProfile = userProfileGateway.getByUserId(userId);
+    UserProfile userProfile = userProfileGateway.getByUserId(teamProfile.getOwnUserId());
 
     // 成员目标单据不存在
     if (Boolean.FALSE.equals(existsBillTarget(userId))) {
diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java
index 5acf3d9d..25186c65 100644
--- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java
+++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java
@@ -97,9 +97,6 @@ public class UpdateMemberTeamDecay {
     TeamProfile teamProfile = teamProfileService.getById(teamMember.getTeamId());
     ResponseAssert.notNull(TeamErrorCode.USER_NOT_TEAM_MEMBER, teamProfile);
 
-    UserProfile userProfile = userProfileGateway.getByUserId(param.getMemberUserId());
-    ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile);
-
     // 移除成员
     TeamMember removeTeamMember = processRemoveTeamMember(teamMember.getSortId());
     if (Objects.isNull(removeTeamMember)) {
@@ -141,6 +138,9 @@ public class UpdateMemberTeamDecay {
         .setCreateUser(param.getUpdateUser())
     );
 
+    UserProfile userProfile = userProfileGateway.getByUserId(param.getMemberUserId());
+    ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, newTeamProfile.getOwnUserId());
+
     // 移除历史申请
     teamApplicationProcessService.removeByUserId(param.getMemberUserId());
 
diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamBillCycleClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamBillCycleClientServiceImpl.java
index 937bf9f6..c5416fb6 100644
--- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamBillCycleClientServiceImpl.java
+++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamBillCycleClientServiceImpl.java
@@ -334,7 +334,7 @@ public class TeamBillCycleClientServiceImpl implements TeamBillCycleClientServic
         teamProfileService.getById(teamMember.getTeamId());
     ResponseAssert.notNull(TeamErrorCode.TEAM_NOT_FOUND, teamProfile);
 
-    UserProfile userProfile = userProfileGateway.getByUserId(teamMember.getMemberId());
+    UserProfile userProfile = userProfileGateway.getByUserId(teamProfile.getOwnUserId());
     ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile);
 
     Boolean isOpenAutoSalary = isOpenDailyAutoSalary(teamProfile.getRegion());