Commit 18b4a427 by 纪旭 韦

修复调动记录无考勤类型报错

parent 91695c08
...@@ -422,8 +422,8 @@ public HandsonTable GetAttendanceVacationHandsonTable(int allotId) ...@@ -422,8 +422,8 @@ public HandsonTable GetAttendanceVacationHandsonTable(int allotId)
t.PersonnelName, t.PersonnelName,
t.PersonnelNumber, t.PersonnelNumber,
t.AttendanceName, t.AttendanceName,
BegDate = t.BegDate.ToString("d"), BegDate = t.BegDate > DateTime.MinValue ? t.BegDate.ToString("d") : t.BegDate.ToString(),
EndDate = t.EndDate.ToString("d") EndDate = t.EndDate > DateTime.MinValue ? t.EndDate.ToString("d") : t.EndDate.ToString()
}); });
if (convertDate == null) if (convertDate == null)
return handson; return handson;
...@@ -458,7 +458,7 @@ public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId) ...@@ -458,7 +458,7 @@ public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId)
var vacatione = perfoPperAttendanceVacationeRepository.GetEntities(t => t.AllotId == allotId); var vacatione = perfoPperAttendanceVacationeRepository.GetEntities(t => t.AllotId == allotId);
var type = perfoPperAttendanceTypeRepository.GetEntities(t => t.AllotId == allotId); var type = perfoPperAttendanceTypeRepository.GetEntities(t => t.AllotId == allotId);
if (type.Count == 0) if (type.Count == 0)
return new ApiResponse<List<RecordAttendcance>>(ResponseType.Fail, "没有考勤类型"); return new ApiResponse<List<RecordAttendcance>>(ResponseType.Fail, new List<RecordAttendcance>());
var data = from a in vacatione var data = from a in vacatione
join b in type on a.TypeId equals b.Id into temp join b in type on a.TypeId equals b.Id into temp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment