diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/help/HelpHeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/help/HelpHeroLogic.java index cd938a2a6..2f31e2e39 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/help/HelpHeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/help/HelpHeroLogic.java @@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory; import rpc.protocols.CommonProto; import util.TimeUtils; -import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; import static com.ljsd.jieling.logic.help.HelpTypeEnum.Me; @@ -131,13 +131,14 @@ public class HelpHeroLogic { } } // 已选中的助战 + List strings = result.stream().map(v -> v.getHero().getId()).collect(Collectors.toList()); HelpHero helpHero = getHelpHeroByType(user.getId(), typeEnum.getPropertyId()); - if (helpHero != null){ + if (helpHero != null && !strings.contains(helpHero.getHero().getId())){ result.add(CBean2Proto.helpHeroProto(helpHero)); } break; - default: - return result; + default: + return result; } return result;