辅助报工时间

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -302,19 +302,22 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
 //            reject.setProcessId(bizDayworkAuxiliaryItem.getProcessId());
 //            reject.setLotId(bizDayworkAuxiliaryItem.getLotId());
 //            rejects.add(reject);
-            l.getRejectList().forEach(ll -> {
-                ll.setProductionPlanId(bizDayworkAuxiliaryItem.getProductionPlanId());
-                ll.setUserId(getUserId());
-                ll.setDayworkId(l.getDayworkId());
-                ll.setDayworkItemId(l.getDayworkItemId());
-                ll.setProductionPlanDetailId(bizDayworkAuxiliaryItem.getProductionPlanDetailId());
-                ll.setProcessId(bizDayworkAuxiliaryItem.getProcessId());
-                ll.setDeptId(bizDayworkAuxiliaryItem.getDeptId());
-                ll.setLotId(bizDayworkAuxiliaryItem.getLotId());
-                ll.setDayworkAuxiliaryItemId(bizDayworkAuxiliaryItem.getId());
-                ll.setDayworkAuxiliaryItemRejectId(l.getId());
-                rejects.add(ll);
-            });
+            if (!l.getRejectList().isEmpty()){
+                l.getRejectList().forEach(ll -> {
+                    ll.setProductionPlanId(bizDayworkAuxiliaryItem.getProductionPlanId());
+                    ll.setUserId(getUserId());
+                    ll.setDayworkId(l.getDayworkId());
+                    ll.setDayworkItemId(l.getDayworkItemId());
+                    ll.setProductionPlanDetailId(bizDayworkAuxiliaryItem.getProductionPlanDetailId());
+                    ll.setProcessId(bizDayworkAuxiliaryItem.getProcessId());
+                    ll.setDeptId(bizDayworkAuxiliaryItem.getDeptId());
+                    ll.setLotId(bizDayworkAuxiliaryItem.getLotId());
+                    ll.setDayworkAuxiliaryItemId(bizDayworkAuxiliaryItem.getId());
+                    ll.setDayworkAuxiliaryItemRejectId(l.getId());
+                    rejects.add(ll);
+                });
+            }
+
         });
         bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
         bizDayworkAuxiliaryItemRejectService.saveOrUpdateBatch(bizDayworkAuxiliaryItem.getRejectList());