febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
@@ -14,7 +14,7 @@ </select> <select id="selectPageVo" resultType="java.util.Map"> select a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb, (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName from t_emp_baseinfo a (select allDeptName from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName from t_emp_baseinfo a inner join t_dept c on a.deptId = c.DEPT_ID left join t_emp_accessory acc on acc.empId = a.empId ${ew.customSqlSegment} febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOpenArchivesServiceImpl.java
@@ -8,6 +8,7 @@ import cc.mrbird.febs.server.hr.mapper.EmpOpenArchivesMapper; import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService; import cc.mrbird.febs.server.hr.service.IEmpOpenArchivesService; import cn.hutool.core.date.DateUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Propagation; @@ -71,7 +72,7 @@ empBaseInfo.setEntryType(empOpenarchives.getOpenType()); empBaseInfo.setEmpStatus("0"); empBaseInfo.setDimissionType(""); empBaseInfo.setDimissionDate(null); empBaseInfo.setDimissionDate(DateUtil.parse("1900-01-01")); empBaseInfo.setModifyTime(new Date()); empBaseInfo.setModifier(operatorId); empBaseInfoService.saveOrUpdate(empBaseInfo);