From 195bbccd16eef5a9af07764a1b5ea420d1b081be Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Thu, 4 Jun 2026 16:43:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/order/mapper/YieldOrderMapper.xml    | 11 +++++---
 .../service/impl/YieldOrderServiceImpl.java   | 26 ++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml
index 65549f953..c6123834d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml
@@ -165,14 +165,17 @@
         WHERE FATHER_YO_ID = #{yieldOrderId}
         AND IS_DELETED = 0
     </select>
+
     <select id="selectByFatherYoIds" resultType="org.springblade.desk.order.pojo.entity.YieldOrder">
         SELECT <include refid="baseCommonFields" />
         FROM MES_YIELD_ORDER yo
         WHERE IS_DELETED = 0
-        AND FATHER_YO_ID IN
-        <foreach collection = "ids" item = "yieldOrderId" open = "(" separator = "," close = ")">
-            #{yieldOrderId}
-        </foreach>
+        <if test="ids != null and ids.size() > 0">
+            AND FATHER_YO_ID IN
+            <foreach collection = "ids" item = "yieldOrderId" open = "(" separator = "," close = ")">
+                #{yieldOrderId}
+            </foreach>
+        </if>
     </select>
 
     <update id="updateOldMesPrWorkOrder">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index 2f494a5d8..474fc36b4 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -276,18 +276,20 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                 .map(YieldOrder::getId)
                 .collect(Collectors.toList());
 
-        // 查询子订单
-        List<YieldOrder> childOrderList = baseMapper.selectByFatherYoIds(idList);
-
-        // 按父ID分组
-        Map<Long, List<YieldOrder>> childMap = childOrderList.stream()
-                .filter(child -> child.getFatherYoId() != null)
-                .collect(Collectors.groupingBy(YieldOrder::getFatherYoId));
-
-        // 组装到父订单
-        dataList.forEach(parent -> {
-            parent.setChildren(childMap.get(parent.getId()));
-        });
+        if(!CollectionUtils.isEmpty(idList)){
+            // 查询子订单
+            List<YieldOrder> childOrderList = baseMapper.selectByFatherYoIds(idList);
+
+            // 按父ID分组
+            Map<Long, List<YieldOrder>> childMap = childOrderList.stream()
+                    .filter(child -> child.getFatherYoId() != null)
+                    .collect(Collectors.groupingBy(YieldOrder::getFatherYoId));
+
+            // 组装到父订单
+            dataList.forEach(parent -> {
+                parent.setChildren(childMap.get(parent.getId()));
+            });
+        }
 
         return page.setRecords(dataList);
     }