From 5cecdaf38590b40301d7bc9ad744fb917ccabe4d Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Sat, 23 Aug 2025 08:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../out/service/impl/OutMonthPlanServiceImpl.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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<OutMonthPlanMapper, Out
             .eq(OutMonthPlan::getProjectId, outMonthPlan.getProjectId())
             .eq(OutMonthPlan::getPlanMonth, outMonthPlan.getPlanMonth())
         );
-        Set<String> collect = outMonthPlans.stream().map(OutMonthPlan::getValueType).collect(Collectors.toSet());
-        return collect.contains("1") && collect.contains("2") && collect.contains("3");
+        Set<String> collectA = outMonthPlans.stream().filter(vo -> "1".equals(vo.getType()))
+            .map(OutMonthPlan::getValueType).collect(Collectors.toSet());
+
+        Set<String> 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