|
|
@@ -422,10 +422,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
}
|
|
|
final List<SysOrg> orgList = getExecOrgList(plan.getPlanExecOrgList(), plan.getExecOrgType(), plan.getBelongOrgPath());
|
|
|
final List<SysWorkTime> workTimeList = getWorkTimeList(orgList, start, end);
|
|
|
- if (workTimeList.isEmpty()) {
|
|
|
- log.error("生成任务时,需要生成任务的机构均未营业,本次任务跳过!");
|
|
|
- return;
|
|
|
- }
|
|
|
saveTaskAndRoleData(plan, start, end, orgList, workTimeList);
|
|
|
|
|
|
}
|
|
|
@@ -670,7 +666,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
planIdList = coreEduTrainingPlanMapper.selectIdByParentId(plan.getId());
|
|
|
planId = null;
|
|
|
}
|
|
|
- if (ObjectUtil.isAllEmpty(planId,planIdList)){
|
|
|
+ if (ObjectUtil.isAllEmpty(planId, planIdList)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
request.setStartTime(DateUtil.beginOfMonth(request.getDate()));
|