值班日历导出

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/duty/service/impl/DutyServiceImpl.java

@@ -1613,7 +1613,9 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
                             .eq(TSysDuty::getClasses, tSysDuty.getClasses())
                     );
                     //如果值班日志不为空
+                    System.out.println("tSysDutyLog-------->"+tSysDutyLog);
                     if (tSysDutyLog != null) {
+                        if(!"".equals(tSysDutyLog.getJobId()) && null != tSysDutyLog.getJobId()){
                             String[] jobIds = tSysDutyLog.getJobId().split(",");
                             //获取作业活动
                             List<TSysTaskWork> taskWorks = tSysTaskWorkService.list(new LambdaQueryWrapper<TSysTaskWork>().in(TSysTaskWork::getId, jobIds));
@@ -1632,6 +1634,7 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
                             } else {
                                 exportDutyPos.add(exportDutyPo);
                             }
+                        }
                     }else {
                         exportDutyPos.add(exportDutyPo);
                     }