hfxc226 3 年之前
父节点
当前提交
7f2b7ad819
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      platform-dao/src/main/java/com/platform/dao/vo/tuicalendar/TuiCalendarUtil.java

+ 6 - 6
platform-dao/src/main/java/com/platform/dao/vo/tuicalendar/TuiCalendarUtil.java

@@ -141,16 +141,16 @@ public class TuiCalendarUtil {
             scheduleInfo.setCalendarId("5");
         } else {
             if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue())) {
-                if(checkJobVO.getReceiveOvertime()){
-                    scheduleInfo.setCalendarId("2");
-                }else{
+                if(checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime()){
                     scheduleInfo.setCalendarId("1");
+                }else{
+                    scheduleInfo.setCalendarId("2");
                 }
             }else if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue())) {
-                if (checkJobVO.getReceiveOvertime()) {
-                    scheduleInfo.setCalendarId("4");
-                } else {
+                if (checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime()) {
                     scheduleInfo.setCalendarId("3");
+                } else {
+                    scheduleInfo.setCalendarId("4");
                 }
             }else{
                 System.out.println("状态:" + checkJobVO.getStatus() );