履职任务生成容错作息错误

project_data/sql/0.0.2/soc 9月14号11.30 以后的增量部分脚本.sql

@@ -105,3 +105,4 @@ CREATE TABLE `core_question` (
 UPDATE`sys_dict_data` SET `dict_label` = '待确认' WHERE `dict_code` = 360;
 UPDATE `sys_dict_data` SET `dict_label` = '待履职' WHERE `dict_code` = 194;
 UPDATE `sys_dict_data` SET `status` = '1' WHERE `dict_code` in( 203,208,209);
+update sys_menu set icon=SUBSTR(icon,24) WHERE icon like 'http://10.87.10.55:8080%';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -24,6 +24,7 @@ import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
 import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import com.xunmei.system.api.Eto.OrgListByTypesConditionEto;
 import com.xunmei.system.api.RemoteConfigService;
+import com.xunmei.system.api.RemoteLogService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteWorkTimeService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -35,6 +36,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -71,6 +73,9 @@ public class ResumptionTaskBusiness {
      * 食堂履职执行时刻
      */
     List<Integer> canteenPlanExec = Arrays.asList(4, 5, 6);
+//
+//    @Resource
+//    RemoteLogService remoteLogService;
 
     @Async
     public void syncHour(final DateTime dateTime, int plancycle) {//plancycle==6
@@ -291,9 +296,12 @@ public class ResumptionTaskBusiness {
                 DateTime planendTime = null;
 
                 if (workTime != null) {
-
                     String opentime = workTime.getOpenTime();//营业时间
                     String closetime = workTime.getCloseTime();//营业终了
+                    if (StringUtils.isEmpty(opentime) || StringUtils.isEmpty(closetime)) {
+                        log.warn("机构" + orgId + "的作息配置错误，opentime:" + opentime + ",closetime:" + closetime);
+                        continue;
+                    }
                     if (appPlan.getPlanExec() == 1) {//全天 上班时间-下班时间 00:00:00-23:59:59
                         DateTime time1 = new DateTime(dateTime);
                         time1.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));