diff --git a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java index 9372a990a..f63d4f9ec 100644 --- a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java +++ b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java @@ -37,6 +37,7 @@ import com.weaver.util.threadPool.entity.LocalRunnable; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import weaver.general.Util; import weaver.hrm.User; import java.util.*; @@ -256,11 +257,13 @@ public class EmployeeDeclareWrapper extends Service { DataCollectionEmployee simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(employeeDeclare.getEmployeeId()); employeeMap.put("id", simpleEmployee.getEmployeeId()); employeeMap.put("name", simpleEmployee.getUsername()); + employeeMap.put("dismissDate", Util.null2String(simpleEmployee.getDismissdate())); employeeMap.put("_entityType", EmployeeTypeEnum.ORGANIZATION); } else { DataCollectionEmployee extEmployee = getExtEmpService(user).getEmployeeById(employeeDeclare.getEmployeeId()); employeeMap.put("id", extEmployee.getEmployeeId()); employeeMap.put("name", extEmployee.getUsername()); + employeeMap.put("dismissDate", ""); employeeMap.put("_entityType", EmployeeTypeEnum.EXT_EMPLOYEE); } employeeDeclareFrom.setId(employeeDeclare.getId())