From dfde604b325c075922c1c4bee31ca9870fb60178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 8 Mar 2023 17:54:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysDepartControlle?= =?UTF-8?q?r=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDepartController.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) 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 + } + } + /** * 查询所有部门信息