diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index 168ad2c39..07d583990 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -527,8 +527,8 @@ export async function generPVPOppRecInfo(isSuccess: boolean, curOpp: OppPlayer,
         }
     }
     let addSumScore = 0;
-    if(!curOpp.isRobot && !isSuccess) {
-        let pvpDefense = await PvpDefenseModel.findByRoleId(robotIdComBack(curOpp.roleId));
+    let pvpDefense = curOpp.isRobot? null: await PvpDefenseModel.findByRoleId(robotIdComBack(curOpp.roleId));
+    if(pvpDefense && !isSuccess) {
         if(pvpDefense && pvpDefense.defense) {
             let { attack, defense, heroScores, score, defenseScoreCnt, refDefenseScore } = pvpDefense;
             if(shouldRefresh(refDefenseScore, new Date())) {
@@ -560,7 +560,7 @@ export async function generPVPOppRecInfo(isSuccess: boolean, curOpp: OppPlayer,
     }
 
     let defenseInfo = new PvpRecordPlayerInfo();
-    defenseInfo.setByHistoryOpp(oppRole, oppHeroRecords, !isSuccess, isSuccess ? 0 : addSumScore, serverId)
+    defenseInfo.setByHistoryOpp(oppRole, oppHeroRecords, !isSuccess, isSuccess ? 0 : addSumScore, pvpDefense?.serverId||serverId)
     return defenseInfo
 }