烧结生产

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
+        <if test="ids != null and ids.size() > 0">
-        <foreach collection = "ids" item = "yieldOrderId" open = "(" separator = "," close = ")">
+            AND FATHER_YO_ID IN
-            #{yieldOrderId}
+            <foreach collection = "ids" item = "yieldOrderId" open = "(" separator = "," close = ")">
-        </foreach>
+                #{yieldOrderId}
+            </foreach>
+        </if>
     </select>
 
     <update id="updateOldMesPrWorkOrder">

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());
 
-        // 查询子订单
+        if(!CollectionUtils.isEmpty(idList)){
-        List<YieldOrder> childOrderList = baseMapper.selectByFatherYoIds(idList);
+            // 查询子订单
-
+            List<YieldOrder> childOrderList = baseMapper.selectByFatherYoIds(idList);
-        // 按父ID分组
+
-        Map<Long, List<YieldOrder>> childMap = childOrderList.stream()
+            // 按父ID分组
-                .filter(child -> child.getFatherYoId() != null)
+            Map<Long, List<YieldOrder>> childMap = childOrderList.stream()
-                .collect(Collectors.groupingBy(YieldOrder::getFatherYoId));
+                    .filter(child -> child.getFatherYoId() != null)
-
+                    .collect(Collectors.groupingBy(YieldOrder::getFatherYoId));
-        // 组装到父订单
+
-        dataList.forEach(parent -> {
+            // 组装到父订单
-            parent.setChildren(childMap.get(parent.getId()));
+            dataList.forEach(parent -> {
-        });
+                parent.setChildren(childMap.get(parent.getId()));
+            });
+        }
 
         return page.setRecords(dataList);
     }