Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizCarrierController.java

@@ -146,7 +146,7 @@ public class BizCarrierController extends BaseController {
         List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDaywork.getId()).list();
         List<BizDayworkItem> currentItem = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").list();
         List<BizCarrier> carriers = bizCarrierService.query().in("id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
-        List<BizCarrierReject> carrierRejects = bizCarrierRejectService.query().in("carrier_id", carriers.stream().map(BizCarrier::getId).collect(Collectors.toList())).list();
+        List<BizCarrierReject> carrierRejects = bizCarrierRejectService.query().in("carrier_id", carriers.isEmpty() ? Collections.singletonList(0L) : carriers.stream().map(BizCarrier::getId).collect(Collectors.toList())).list();
         carriers.stream().forEach(v->{v.setIsAbandoned(0);});
         if (carriers.isEmpty()) {
             // 该报工没有周转箱 提示选择周转箱

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -153,7 +153,8 @@ public class SortDayworkController extends BaseController {
         bizDayworkItem.setEndTime(new Date());
         result = result && bizDayworkItemService.updateById(bizDayworkItem);
         BizDaywork bizDaywork = bizDayworkService.getById(item.getDayworkId());
-        boolean returnCarrier = false;
+        boolean returnCarrier;
+
 
         if (bizDaywork.getIsAmend().equals(1) || bizDaywork.getIsWasteRecycling().equals(1)) {
             List<BizLotTechnologicalProcess> processes = bizLotTechnologicalProcessService.query().eq("lot_id", bizDaywork.getLotId()).list();