Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!450

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

@@ -3355,6 +3355,7 @@ public class ClockInController {
 						.eq(KqglAssoRelationSummary::getAppTime, str));
 						.eq(KqglAssoRelationSummary::getAppTime, str));
 			 if(trap.size() > 0) {
 			 if(trap.size() > 0) {
 				 for(KqglAssoRelationSummary spnsw : trap) {
 				 for(KqglAssoRelationSummary spnsw : trap) {
+					 if(spnsw.getApprovalType() != 5) {
 						 TransactionApprovalDto taap = TransactionApprovalDto.builder().build();
 						 TransactionApprovalDto taap = TransactionApprovalDto.builder().build();
 						 
 						 
 						 if(spnsw.getApprovalType() == 1) {
 						 if(spnsw.getApprovalType() == 1) {
@@ -3398,6 +3399,7 @@ public class ClockInController {
 						 
 						 
 						 attdate.setTranappr(tranappr);
 						 attdate.setTranappr(tranappr);
 					 }
 					 }
+				 }
 			 }else {
 			 }else {
 				 attdate.setTranappr(tranappr);
 				 attdate.setTranappr(tranappr);
 			 }
 			 }