考勤-修复计算组织部准确的问题

76f740a5 · luojing · bf846d53 · 76f740a5
Showing with 5 addition and 2 deletion

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceDetailAnalyseService.java ...emble/control/service/AttendanceDetailAnalyseService.java +5 -2

未找到文件。
--- 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{