diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index fc366b7b..a060de6e 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -145,9 +145,11 @@ public class EquPlanServiceImpl implements IEquPlanService {
 
         equPlan.setPlanId(IdUtils.fastSimpleUUID());// 计划id
         equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum));// 计划编码
-        if (equPlan.getPlanTimeArray().size() > 0) {
-            equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
-            equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
+        if (equPlan.getPlanTimeArray() != null){
+            if (equPlan.getPlanTimeArray().size() > 0) {
+                equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
+                equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
+            }
         }
         equPlan.setFactoryCode(factory);// 工厂编码
         equPlan.setCreateBy(SecurityContextHolder.getUserName());
@@ -174,9 +176,11 @@ public class EquPlanServiceImpl implements IEquPlanService {
     @DS("#header.poolName")
     public AjaxResult updateEquPlan(EquPlan equPlan) {
         // 设置循环范围时间
-        if (equPlan.getPlanTimeArray().size() > 0) {
-            equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 循环开始时间
-            equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 循环结束时间
+        if (equPlan.getPlanTimeArray() != null){
+            if (equPlan.getPlanTimeArray().size() > 0) {
+                equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
+                equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
+            }
         }
         // 更新计划
         equPlanMapper.updateEquPlan(equPlan);