Merge branch 'master' of http://106.120.201.126:14725/signal/traffic-signal-platform

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/RunningPlanServiceImpl.java

@@ -131,6 +131,9 @@ public class RunningPlanServiceImpl implements RunningPlanService {
             execListElement.setWeek(week);
             execListElement.setSpecialDateList(specialDateList);
             BaseCrossPlanPO baseCrossPlanPO = baseCrossPlanMapper.selectById(planId);
+            if (ObjectUtil.isEmpty(baseCrossPlanPO)){
+                continue;
+            }
             execListElement.setPlanName(baseCrossPlanPO.getName());
             execListElement.setPlanId(baseCrossPlanPO.getId());
             execList.add(execListElement);

wj-common/src/main/java/net/wanji/common/utils/tool/ScheduleUtil.java

@@ -45,7 +45,7 @@ public class ScheduleUtil {
             if (aChar == 49) {
                 if (type == 3) {
                     if (i == 0){
-                        //星期日是0
+                        //星期日是7
                         str.append(7).append(",");
                     }else {
                         str.append(i).append(",");