值班日历导出

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

@@ -1613,24 +1613,27 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
                             .eq(TSysDuty::getClasses, tSysDuty.getClasses())
                     );
                     //如果值班日志不为空
+                    System.out.println("tSysDutyLog-------->"+tSysDutyLog);
                     if (tSysDutyLog != null) {
-                        String[] jobIds = tSysDutyLog.getJobId().split(",");
-                        //获取作业活动
-                        List<TSysTaskWork> taskWorks = tSysTaskWorkService.list(new LambdaQueryWrapper<TSysTaskWork>().in(TSysTaskWork::getId, jobIds));
-                        if (taskWorks != null && taskWorks.size() > 0) {
-                            for (TSysTaskWork taskWork : taskWorks) {
-                                ExportDutyPo exportDutyPo1 = exportDutyPo;
-                                exportDutyPo1.setContent(taskWork.getContent());
-                                exportDutyPo1.setToll(String.valueOf(count));
-                                String involvePerson = taskWork.getInvolvePerson();
-                                if (StringUtils.isNotBlank(involvePerson)) {
-                                    String[] involvePersons = involvePerson.split(",");
-                                    exportDutyPo1.setPartiesInvolved(String.valueOf(involvePersons.length));
+                        if(!"".equals(tSysDutyLog.getJobId()) && null != tSysDutyLog.getJobId()){
+                            String[] jobIds = tSysDutyLog.getJobId().split(",");
+                            //获取作业活动
+                            List<TSysTaskWork> taskWorks = tSysTaskWorkService.list(new LambdaQueryWrapper<TSysTaskWork>().in(TSysTaskWork::getId, jobIds));
+                            if (taskWorks != null && taskWorks.size() > 0) {
+                                for (TSysTaskWork taskWork : taskWorks) {
+                                    ExportDutyPo exportDutyPo1 = exportDutyPo;
+                                    exportDutyPo1.setContent(taskWork.getContent());
+                                    exportDutyPo1.setToll(String.valueOf(count));
+                                    String involvePerson = taskWork.getInvolvePerson();
+                                    if (StringUtils.isNotBlank(involvePerson)) {
+                                        String[] involvePersons = involvePerson.split(",");
+                                        exportDutyPo1.setPartiesInvolved(String.valueOf(involvePersons.length));
+                                    }
+                                    exportDutyPos.add(exportDutyPo1);
                                 }
-                                exportDutyPos.add(exportDutyPo1);
+                            } else {
+                                exportDutyPos.add(exportDutyPo);
                             }
-                        } else {
-                            exportDutyPos.add(exportDutyPo);
                         }
                     }else {
                         exportDutyPos.add(exportDutyPo);