‘linchangsheng’ 6 月之前
父节点
当前提交
2c46d7d16e

+ 11 - 8
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -211,14 +211,17 @@ public class WorkerManagerLogic {
 
         AdminWebsit adminWebsit = adminWebsitService.getById(workerManagerBean.getWebsitId());
 
-        for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
-            if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
-                workerPolicy.setStatus("ON");
-            }else {
-                workerPolicy.setStatus("WAIT_ON");
-            }
-            if (workerPolicy.getEndTime().before(new Date())) {
-                workerPolicy.setStatus("OFF");
+        if (!CollectionUtils.isEmpty(workerManagerBean.getWorkerPolicies())) {
+
+            for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
+                if (workerPolicy.getEndTime().after(new Date()) && workerPolicy.getStartTime().before(new Date())) {
+                    workerPolicy.setStatus("ON");
+                } else {
+                    workerPolicy.setStatus("WAIT_ON");
+                }
+                if (workerPolicy.getEndTime().before(new Date())) {
+                    workerPolicy.setStatus("OFF");
+                }
             }
         }