提交

5091aa1f · ilal · 2b05c7a3 · 5091aa1f
Commit 5091aa1f authored 4 years ago by ilal
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 21 deletions

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+23 -21

No files found.
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -3374,27 +3374,29 @@ public class ClockInController {
 						 taap.setCalendar_status_type(11);
 					 }else if(spnsw.getApprovalType() == 2) {
 						 KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,spnsw.getLeaveTypeId()));
-					 	if(rul.getRulesType() == 1) {
+					 	if(rul.getRulesType() != null) {
-					 		taap.setCalendar_status_type(1);
+							if(rul.getRulesType() == 1) {
-						}else if(rul.getRulesType() == 2) {
+						 		taap.setCalendar_status_type(1);
-							taap.setCalendar_status_type(2);
+							}else if(rul.getRulesType() == 2) {
-						}else if(rul.getRulesType() == 3) {
+								taap.setCalendar_status_type(2);
-							taap.setCalendar_status_type(3);
+							}else if(rul.getRulesType() == 3) {
-						}else if(rul.getRulesType() == 4) {
+								taap.setCalendar_status_type(3);
-							taap.setCalendar_status_type(4);
+							}else if(rul.getRulesType() == 4) {
-						}else if(rul.getRulesType() == 5) {
+								taap.setCalendar_status_type(4);
-							taap.setCalendar_status_type(5);
+							}else if(rul.getRulesType() == 5) {
-						}else if(rul.getRulesType() == 6) {
+								taap.setCalendar_status_type(5);
-							taap.setCalendar_status_type(6);
+							}else if(rul.getRulesType() == 6) {
-						}else if(rul.getRulesType() == 7) {
+								taap.setCalendar_status_type(6);
-							taap.setCalendar_status_type(7);
+							}else if(rul.getRulesType() == 7) {
-						}else if(rul.getRulesType() == 8) {
+								taap.setCalendar_status_type(7);
-							taap.setCalendar_status_type(8);
+							}else if(rul.getRulesType() == 8) {
-						}else if(rul.getRulesType() == 9) {
+								taap.setCalendar_status_type(8);
-							taap.setCalendar_status_type(9);
+							}else if(rul.getRulesType() == 9) {
-						}else if(rul.getRulesType() == 10) {
+								taap.setCalendar_status_type(9);
-							taap.setCalendar_status_type(10);
+							}else if(rul.getRulesType() == 10) {
-						}
+								taap.setCalendar_status_type(10);
+							}
+					 	}
 					}else if(spnsw.getApprovalType() == 3) {
 						taap.setCalendar_status_type(12);
 					}else if(spnsw.getApprovalType() == 4) {