烧结生产

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
+        <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">

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -276,6 +276,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                 .map(YieldOrder::getId)
                 .collect(Collectors.toList());
 
+        if(!CollectionUtils.isEmpty(idList)){
             // 查询子订单
             List<YieldOrder> childOrderList = baseMapper.selectByFatherYoIds(idList);
 
@@ -288,6 +289,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
             dataList.forEach(parent -> {
                 parent.setChildren(childMap.get(parent.getId()));
             });
+        }
 
         return page.setRecords(dataList);
     }