Bladeren bron

no message

(cherry picked from commit 2670671e91a42025cd48284a1577a840897a2eb6)
ly 1 jaar geleden
bovenliggende
commit
0d2f487ccc

+ 1 - 1
src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderCurrentController.java

@@ -365,7 +365,7 @@ public class WorkOrderCurrentController extends BaseController {
             // 设置日期
             calendar.set(Calendar.DAY_OF_MONTH, 1);
             Date currentMonthDate = new java.sql.Date(calendar.getTime().getTime());
-            if (currentMonthDate == workOrder.get(0).getEndMonth()) {
+            if (!workOrder.isEmpty() && currentMonthDate == workOrder.get(0).getEndMonth()) {
                 entrusts.removeIf(s -> s.getWorkOrderId().equals(b.getWorkOrderId()));
             }
         }

+ 1 - 1
src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderNextController.java

@@ -140,7 +140,7 @@ public class WorkOrderNextController extends BaseController {
             setTenantId(bizWorkOrder);
         }
 
-        startPage();
+//        startPage();
         startOrderBy();
         bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);