diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java index f55c22f..a1292cc 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserEmployeeExServiceImpl.java @@ -1107,19 +1107,25 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl=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());