优化

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -900,16 +900,18 @@ public class YongyouServiceImpl implements YongyouService {
             LongYanPurchaseOrderDTO orderDTO = new LongYanPurchaseOrderDTO();
             orderDTO.setMergeId(id);
             List<LongYanPurchaseOrderVO> longYanPurchaseOrderVOS = longYanPurchaseOrderMapper.selectList(orderDTO);
-            Weekend<LongYanPurchaseOrder> weekend = new Weekend<>(LongYanPurchaseOrder.class);
-            WeekendCriteria<LongYanPurchaseOrder, Object> weekendCriteria = weekend.weekendCriteria();
-            List<String> orderIds = longYanPurchaseOrderVOS.stream().map(LongYanPurchaseOrderVO::getId).collect(Collectors.toList());
-            weekendCriteria.andIn(LongYanPurchaseOrder::getId, orderIds);
-            longYanPurchaseOrderMapper.deleteByExample(weekend);
-
-            Weekend<LongYanPurchaseDetail> weekend1 = new Weekend<>(LongYanPurchaseDetail.class);
-            WeekendCriteria<LongYanPurchaseDetail, Object> weekendCriteria1 = weekend1.weekendCriteria();
-            weekendCriteria1.andIn(LongYanPurchaseDetail::getLongYangPurchaseOrderId, orderIds);
-            longYanPurchaseDetailMapper.deleteByExample(weekend1);
+            if (longYanPurchaseOrderVOS!=null&&longYanPurchaseOrderVOS.size()>0) {
+                Weekend<LongYanPurchaseOrder> weekend = new Weekend<>(LongYanPurchaseOrder.class);
+                WeekendCriteria<LongYanPurchaseOrder, Object> weekendCriteria = weekend.weekendCriteria();
+                List<String> orderIds = longYanPurchaseOrderVOS.stream().map(LongYanPurchaseOrderVO::getId).collect(Collectors.toList());
+                weekendCriteria.andIn(LongYanPurchaseOrder::getId, orderIds);
+                longYanPurchaseOrderMapper.deleteByExample(weekend);
+
+                Weekend<LongYanPurchaseDetail> weekend1 = new Weekend<>(LongYanPurchaseDetail.class);
+                WeekendCriteria<LongYanPurchaseDetail, Object> weekendCriteria1 = weekend1.weekendCriteria();
+                weekendCriteria1.andIn(LongYanPurchaseDetail::getLongYangPurchaseOrderId, orderIds);
+                longYanPurchaseDetailMapper.deleteByExample(weekend1);
+            }
             return "删除成功";
         } else {
             DeletePurchaseOrderRequest request = new DeletePurchaseOrderRequest();
@@ -934,16 +936,18 @@ public class YongyouServiceImpl implements YongyouService {
                 LongYanPurchaseOrderDTO orderDTO = new LongYanPurchaseOrderDTO();
                 orderDTO.setMergeId(id);
                 List<LongYanPurchaseOrderVO> longYanPurchaseOrderVOS = longYanPurchaseOrderMapper.selectList(orderDTO);
-                Weekend<LongYanPurchaseOrder> weekend = new Weekend<>(LongYanPurchaseOrder.class);
-                WeekendCriteria<LongYanPurchaseOrder, Object> weekendCriteria = weekend.weekendCriteria();
-                List<String> orderIds = longYanPurchaseOrderVOS.stream().map(LongYanPurchaseOrderVO::getId).collect(Collectors.toList());
-                weekendCriteria.andIn(LongYanPurchaseOrder::getId, orderIds);
-                longYanPurchaseOrderMapper.deleteByExample(weekend);
-
-                Weekend<LongYanPurchaseDetail> weekend1 = new Weekend<>(LongYanPurchaseDetail.class);
-                WeekendCriteria<LongYanPurchaseDetail, Object> weekendCriteria1 = weekend1.weekendCriteria();
-                weekendCriteria1.andIn(LongYanPurchaseDetail::getLongYangPurchaseOrderId, orderIds);
-                longYanPurchaseDetailMapper.deleteByExample(weekend1);
+                if (longYanPurchaseOrderVOS!=null&&longYanPurchaseOrderVOS.size()>0) {
+                    Weekend<LongYanPurchaseOrder> weekend = new Weekend<>(LongYanPurchaseOrder.class);
+                    WeekendCriteria<LongYanPurchaseOrder, Object> weekendCriteria = weekend.weekendCriteria();
+                    List<String> orderIds = longYanPurchaseOrderVOS.stream().map(LongYanPurchaseOrderVO::getId).collect(Collectors.toList());
+                    weekendCriteria.andIn(LongYanPurchaseOrder::getId, orderIds);
+                    longYanPurchaseOrderMapper.deleteByExample(weekend);
+
+                    Weekend<LongYanPurchaseDetail> weekend1 = new Weekend<>(LongYanPurchaseDetail.class);
+                    WeekendCriteria<LongYanPurchaseDetail, Object> weekendCriteria1 = weekend1.weekendCriteria();
+                    weekendCriteria1.andIn(LongYanPurchaseDetail::getLongYangPurchaseOrderId, orderIds);
+                    longYanPurchaseDetailMapper.deleteByExample(weekend1);
+                }
             }
 
             return response.getMsg();