Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!448

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -3029,7 +3029,7 @@ public class ClockInController {
 			    					}else if(asssum1.getApprovalType() == 2) {
 			    					}else if(asssum1.getApprovalType() == 2) {
 			    						//请假
 			    						//请假
 			    						KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,asssum1.getLeaveTypeId()));
 			    						KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,asssum1.getLeaveTypeId()));
-			    						if(rul.getRulesType() == null) {
+			    						if(rul.getRulesType() != null) {
 				    						if(rul.getRulesType() == 1) {
 				    						if(rul.getRulesType() == 1) {
 				    							dkjl.setCalendar_status_type(1);
 				    							dkjl.setCalendar_status_type(1);
 				    							
 				    							
@@ -3245,11 +3245,8 @@ public class ClockInController {
 								 AttSchedule attw = attsch.get(dk.getSort()+cr-1);
 								 AttSchedule attw = attsch.get(dk.getSort()+cr-1);
 								 attw.setIsupdate(1);
 								 attw.setIsupdate(1);
 							 }
 							 }
-							 
-							 
 						 }else {
 						 }else {
 							 if(iscrdk) {
 							 if(iscrdk) {
-								 
 								 if(attdate.getAttsch().size() == 2) {
 								 if(attdate.getAttsch().size() == 2) {
 									 AttSchedule attc = attsch.get(0);
 									 AttSchedule attc = attsch.get(0);
 									 AttSchedule attcto = attsch.get(1);
 									 AttSchedule attcto = attsch.get(1);
@@ -3283,7 +3280,6 @@ public class ClockInController {
 									 }
 									 }
 									 attc.setIsdk(0);
 									 attc.setIsdk(0);
 								 }
 								 }
-								 
 							 }else {
 							 }else {
 								 if(crlasttime != null) {
 								 if(crlasttime != null) {
 									 Timestamp dd = Timestamp.valueOf(crlasttime);
 									 Timestamp dd = Timestamp.valueOf(crlasttime);
@@ -3313,11 +3309,13 @@ public class ClockInController {
 							 }
 							 }
 							 
 							 
 						 }
 						 }
-					 }
 						 
 						 
-					 //当全为缺卡时
 						 
 						 
 						 
 						 
+						 
+						 
+					 }
+					 
 				 }else {
 				 }else {
 					 //休息的时候
 					 //休息的时候
 					 List<AttSchedule> attsch_ = new ArrayList<AttSchedule>();
 					 List<AttSchedule> attsch_ = new ArrayList<AttSchedule>();