hfxc226 3 rokov pred
rodič
commit
7f2b7ad819

+ 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() );