renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改员工导出bug

Browse Source
This commit is contained in:
wanghao
2026-01-05 16:38:25 +08:00
parent de888296d9
commit 66b90d1c14
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java
+14 -8
View File
@@ -1107,19 +1107,25 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
BeanUtils.copyProperties(userEmployee, userEmployeeVo); BeanUtils.copyProperties(userEmployee, userEmployeeVo);
//copy employ信息 //copy employ信息
BeanUtils.copyProperties(userEmployee.getExtension(), userEmployeeVo); BeanUtils.copyProperties(userEmployee.getExtension(), userEmployeeVo);
//插入单位
if (Objects.nonNull(userEmployee.getSecondDepart())) { if (userEmployee.getOrgCode().length()>=6){
userEmployeeVo.setUnit(userEmployee.getSecondDepart().getDepartName()); //插入单位
if (Objects.nonNull(userEmployee.getSecondDepart())) {
userEmployeeVo.setUnit(userEmployee.getSecondDepart().getDepartName());
}
} }
//三级部门 if (userEmployee.getOrgCode().length()>=9){
if (Objects.nonNull(userEmployee.getOrgCode())) { //三级部门
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(userEmployee.getOrgCode())); SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(userEmployee.getOrgCode()));
userEmployeeVo.setThreeDepart(thirdDepart.getDepartName()); userEmployeeVo.setThreeDepart(thirdDepart.getDepartName());
} }
//四级部门 if (userEmployee.getOrgCode().length()>=12){
if (Objects.nonNull(userEmployee.getDepart())) { //四级部门
userEmployeeVo.setDepart(userEmployee.getDepart().getDepartName()); if (Objects.nonNull(userEmployee.getDepart())) {
userEmployeeVo.setDepart(userEmployee.getDepart().getDepartName());
}
} }
//新增sex //新增sex
if (userEmployee.getSex() != null) { if (userEmployee.getSex() != null) {
userEmployeeVo.setSex(userEmployee.getSex().toString()); userEmployeeVo.setSex(userEmployee.getSex().toString());