From b622ca077cd6a4e35c1476d497999538b3720e1a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 三月 2021 00:12:54 +0800
Subject: [PATCH] feat(员工其它信息): 员工档案中的其它信息按时间顺序排序

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index a5a6390..f5b688f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -223,7 +223,7 @@
 				empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
 				empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
 				empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
-				empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
+				empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList,dicItems);
 				empResignService.importEmpResign(listObject.get(6),returnList);
 				empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
 				empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);

--
Gitblit v1.8.0