|
@@ -44,8 +44,8 @@ public class LeaveFactory {
|
|
.personName(leavePO.getApproverName())
|
|
.personName(leavePO.getApproverName())
|
|
.build();
|
|
.build();
|
|
leave.setApprover(approver);
|
|
leave.setApprover(approver);
|
|
- leave.setStartTime(leave.getStartTime());
|
|
|
|
- leave.setStatus(leave.getStatus());
|
|
|
|
|
|
+ leave.setStartTime(leavePO.getStartTime());
|
|
|
|
+ leave.setStatus(leavePO.getStatus());
|
|
List<ApprovalInfo> approvalInfos = getApprovalInfos(leavePO.getHistoryApprovalInfoPOList());
|
|
List<ApprovalInfo> approvalInfos = getApprovalInfos(leavePO.getHistoryApprovalInfoPOList());
|
|
leave.setHistoryApprovalInfos(approvalInfos);
|
|
leave.setHistoryApprovalInfos(approvalInfos);
|
|
return leave;
|
|
return leave;
|