四灵,重复
parent
1d58ba91e1
commit
e0612fe088
|
@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory;
|
||||||
import rpc.protocols.CommonProto;
|
import rpc.protocols.CommonProto;
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static com.ljsd.jieling.logic.help.HelpTypeEnum.Me;
|
import static com.ljsd.jieling.logic.help.HelpTypeEnum.Me;
|
||||||
|
|
||||||
|
@ -131,13 +131,14 @@ public class HelpHeroLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 已选中的助战
|
// 已选中的助战
|
||||||
|
List<String> strings = result.stream().map(v -> v.getHero().getId()).collect(Collectors.toList());
|
||||||
HelpHero helpHero = getHelpHeroByType(user.getId(), typeEnum.getPropertyId());
|
HelpHero helpHero = getHelpHeroByType(user.getId(), typeEnum.getPropertyId());
|
||||||
if (helpHero != null){
|
if (helpHero != null && !strings.contains(helpHero.getHero().getId())){
|
||||||
result.add(CBean2Proto.helpHeroProto(helpHero));
|
result.add(CBean2Proto.helpHeroProto(helpHero));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue