diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
index 708b17495..b1b1dd468 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
@@ -1905,10 +1905,10 @@ public class HeroLogic{
                 !list.contains(entry.getKey())).forEach(entry->{
                 entry.getValue().forEach(value->{
                     if(value.getHeroId().equals(heroId)){
-                        teamPosForHero.get(entry.getKey()).remove(value);
                         if(entry.getKey()==GlobalsDef.ENDLESS_TEAM&&user.getMapManager().getEndlessMapInfo().getEndlessHeroInfo().get(heroId)!=null){
-                                user.getMapManager().removeEndlessHero(heroId);
+                            user.getMapManager().removeEndlessHero(heroId);
                         }
+                        teamPosForHero.get(entry.getKey()).remove(value.getHeroId());
                     }
                 });
             });