Merge remote-tracking branch 'origin/V0.0.3' into V0.0.3

project_data/sql/0.0.3/soc/soc.sql

@@ -1304,7 +1304,7 @@ DELETE FROM `sys_dict_data` where dict_type='out_in_type';
 INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '出入类型', 'out_in_type', '0', 'zlsls01', '2023-11-08 17:24:55', '', NULL, NULL);
 INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (0, '电子', '1', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:16', '', NULL, NULL);
 INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '纸质', '2', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:24', '', NULL, NULL);
-INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '紧急出入', '3', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:32', '', NULL, NULL);
+INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '紧急', '3', 'out_in_type', NULL, 'default', 'N', '0', 'zlsls01', '2023-11-08 17:25:32', '', NULL, NULL);
 
 DELETE FROM `sys_dict_type` where dict_type='out_in_approve_status';
 DELETE FROM `sys_dict_data` where dict_type='out_in_approve_status';

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

@@ -498,6 +498,10 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         }
 
         if (ObjectUtil.equal(execOrg.getType(), OrgTypeEnum.YINGYE_WANGDIAN.getCode())) {
+            if (!allWorkTimes.containsKey(execOrg.getId()) || CollectionUtils.isEmpty(allWorkTimes.get(execOrg.getId()))) {
+                return new ArrayList<>();
+            }
+
             List<SysWorkTime> workTimes = null;
             //营业网点，取作息
             if (ObjectUtil.equal(appPlan.getPlanExec(), ExecTimeCommonEnum.NoBusiness.getCode())) {