diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 647e59038..94ece7067 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -364,12 +364,12 @@ export class ComBattleHandler {
             if (validToJoin(curTeamStatus)) {
                 let roleSt: RoleStatus;
                 for (let st of curTeamStatus.roleStatus) {
-                    if (st.roleId === roleId) {
+                    if (st.isCap) {
                         roleSt = st;
                     }
                 }
                 if (!roleSt) return;
-                let { topLineupCe, lv } = roleSt;
+                let { roleId, topLineupCe, lv } = roleSt;
                 await addRobotsToTeam(curTeamStatus, roleId, topLineupCe, lv, thiz.teamMap, thiz.teamDisTimer, 3 - curTeamStatus.roleIds.length);
             }
         }, COM_BTL_CONST.ASSIST_TIME);