From 76f740a5d76ab2bf6ff60bf9a4c59bebf0d3e86b Mon Sep 17 00:00:00 2001 From: luojing Date: Wed, 18 Aug 2021 16:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E4=BF=AE=E5=A4=8D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E7=BB=84=E7=BB=87=E9=83=A8=E5=87=86=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/service/AttendanceDetailAnalyseService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java index d27e4a1b09..23fa25f34d 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java @@ -232,8 +232,11 @@ public class AttendanceDetailAnalyseService { if( detail != null ){ selfHolidayList = attendanceSelfHolidayService.listWithPersonFromCache(emc, detail.getEmpName(), false ); //查询用户匹配的排班配置 - //scheduleSetting = attendanceScheduleSettingService.getAttendanceScheduleSettingWithPerson( detail.getEmpName(), debugger ); - scheduleSetting = attendanceScheduleSettingService.getAttendanceScheduleSettingWithDetail( detail, debugger ); + if(StringUtils.isNotEmpty(detail.getUnitName())){ + scheduleSetting = attendanceScheduleSettingService.getAttendanceScheduleSettingWithDetail( detail, debugger ); + }else{ + scheduleSetting = attendanceScheduleSettingService.getAttendanceScheduleSettingWithPerson( detail.getEmpName(), debugger ); + } return analyseAttendanceDetail( emc, detail, scheduleSetting, selfHolidayList, workDayConfigList, statisticalCycleMap, debugger ); }else{ -- GitLab