diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java index 90c114ef..b824fb20 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java @@ -210,8 +210,14 @@ public class OutMonthPlanServiceImpl extends ServiceImpl collect = outMonthPlans.stream().map(OutMonthPlan::getValueType).collect(Collectors.toSet()); - return collect.contains("1") && collect.contains("2") && collect.contains("3"); + Set collectA = outMonthPlans.stream().filter(vo -> "1".equals(vo.getType())) + .map(OutMonthPlan::getValueType).collect(Collectors.toSet()); + + Set collectB = outMonthPlans.stream().filter(vo -> "2".equals(vo.getType())) + .map(OutMonthPlan::getValueType).collect(Collectors.toSet()); + + return (collectA.contains("1") && collectA.contains("2") && collectA.contains("3")) + && (collectB.contains("1") && collectB.contains("2") && collectB.contains("3")); } @Override