diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 5ecf8e6e..2f4acaff 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -369,17 +369,8 @@ public class SysDepartController { String parentCode = orgCode.substring(0, orgCode.length()-codeLength); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("org_code", parentCode); - try { - SysDepart parentDept = sysDepartService.getOne(queryWrapper); - if(parentDept != null) { - sysDepart.setParentId(parentDept.getId()); - } else { - sysDepart.setParentId(""); - } - }catch (Exception e) { - //没有查找到parentDept - } - }else{ + setParentId(sysDepart, queryWrapper); + }else{ sysDepart.setParentId(""); } //update-begin---author:liusq Date:20210223 for:批量导入部门以后,不能追加下一级部门 #2245------------ @@ -409,6 +400,19 @@ public class SysDepartController { return Result.error("文件导入失败!"); } + private void setParentId(SysDepart sysDepart, QueryWrapper queryWrapper) { + try { + SysDepart parentDept = sysDepartService.getOne(queryWrapper); + if(parentDept != null) { + sysDepart.setParentId(parentDept.getId()); + } else { + sysDepart.setParentId(""); + } + }catch (Exception e) { + //没有查找到parentDept + } + } + /** * 查询所有部门信息