From dc174d50010e7bdd92382cddb310627a704fc22b Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 19 Aug 2025 13:07:06 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS-=E8=BF=90=E8=BE=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F-=E9=92=88=E5=AF=B9=E7=BC=85=E7=94=B8=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E8=BF=9B=E5=8F=A3=E6=BC=8F=E7=BB=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../xdadan/erp/emis/service/EmisBaseService.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 89cc5f85d..a679d058a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -4911,6 +4911,10 @@ public class EmisBaseService {
                          && !batch.getEtd().before(firstLevelRule.getStartDate())) {
                      firstLevelMatch = true;
                      list.add(firstLevelRule);
+                     // 收集当前第一级节点的所有子节点到第二级集合中
+                     if (!CollectionUtil.isEmpty(firstLevelRule.getChildren())) {
+                         secondLevelRules.addAll(firstLevelRule.getChildren());
+                     }
                      break;
                  }
              }
@@ -4919,10 +4923,6 @@ public class EmisBaseService {
                  hasFirstLevelMatch = true;
              }
 
-             // 收集当前第一级节点的所有子节点到第二级集合中
-             if (!CollectionUtil.isEmpty(firstLevelRule.getChildren())) {
-                 secondLevelRules.addAll(firstLevelRule.getChildren());
-             }
          }
 
          // 如果第二级为空，说明已经到底了，返回当前节点匹配且第一级至少有一个匹配的结果
@@ -4946,6 +4946,10 @@ public class EmisBaseService {
                          && !batch.getEtd().before(secondLevelRule.getStartDate())) {
                      secondLevelMatch = true;
                      list.add(secondLevelRule);
+                     // 收集当前第二级节点的所有子节点到第三级集合中
+                     if (!CollectionUtil.isEmpty(secondLevelRule.getChildren())) {
+                         thirdLevelRules.addAll(secondLevelRule.getChildren());
+                     }
                      break;
                  }
              }
@@ -4954,10 +4958,6 @@ public class EmisBaseService {
                  hasSecondLevelMatch = true;
              }
 
-             // 收集当前第二级节点的所有子节点到第三级集合中
-             if (!CollectionUtil.isEmpty(secondLevelRule.getChildren())) {
-                 thirdLevelRules.addAll(secondLevelRule.getChildren());
-             }
          }
 
          // 递归处理下一级，并收集结果