修改员工导出bug
This commit is contained in:
+14
-8
@@ -1107,19 +1107,25 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
|
||||
BeanUtils.copyProperties(userEmployee, userEmployeeVo);
|
||||
//copy employ信息
|
||||
BeanUtils.copyProperties(userEmployee.getExtension(), userEmployeeVo);
|
||||
//插入单位
|
||||
if (Objects.nonNull(userEmployee.getSecondDepart())) {
|
||||
userEmployeeVo.setUnit(userEmployee.getSecondDepart().getDepartName());
|
||||
|
||||
if (userEmployee.getOrgCode().length()>=6){
|
||||
//插入单位
|
||||
if (Objects.nonNull(userEmployee.getSecondDepart())) {
|
||||
userEmployeeVo.setUnit(userEmployee.getSecondDepart().getDepartName());
|
||||
}
|
||||
}
|
||||
//三级部门
|
||||
if (Objects.nonNull(userEmployee.getOrgCode())) {
|
||||
if (userEmployee.getOrgCode().length()>=9){
|
||||
//三级部门
|
||||
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(userEmployee.getOrgCode()));
|
||||
userEmployeeVo.setThreeDepart(thirdDepart.getDepartName());
|
||||
}
|
||||
//四级部门
|
||||
if (Objects.nonNull(userEmployee.getDepart())) {
|
||||
userEmployeeVo.setDepart(userEmployee.getDepart().getDepartName());
|
||||
if (userEmployee.getOrgCode().length()>=12){
|
||||
//四级部门
|
||||
if (Objects.nonNull(userEmployee.getDepart())) {
|
||||
userEmployeeVo.setDepart(userEmployee.getDepart().getDepartName());
|
||||
}
|
||||
}
|
||||
|
||||
//新增sex
|
||||
if (userEmployee.getSex() != null) {
|
||||
userEmployeeVo.setSex(userEmployee.getSex().toString());
|
||||
|
||||
Reference in New Issue
Block a user