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());