|
@@ -1569,8 +1569,13 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
|
|
|
//获取到请假的开始时间和结束时间
|
|
|
String leaveStart = s[1];
|
|
|
String leaveEnd = isOldFormat ? s[3] : s[4];
|
|
|
-
|
|
|
//检查请假时间段是否在打卡的时间范围内
|
|
|
+ if (baseMorningStart.equals(leaveStart) && baseMorningEnd.equals(leaveEnd)) {
|
|
|
+ morningLeave = true;
|
|
|
+ } else if (baseAfternoonStart.equals(leaveStart) && baseAfternoonEnd.equals(leaveEnd)) {
|
|
|
+ afternoonLeave = true;
|
|
|
+ }
|
|
|
+
|
|
|
if ("上午".equals(leaveEnd) || "下午".equals(leaveEnd)) {
|
|
|
//半天或者全天请假, 上面已经处理过结束时间为请假之前的时间了,此处不需要再处理了
|
|
|
if (ct.getAskLeaveTime() >= 12) {
|