From e6fdfdfafbd7e03434f3ea4ab1d6e32c5493adba Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Tue, 7 Mar 2023 10:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20SysDepartServic?= =?UTF-8?q?eImpl.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDepartServiceImpl.java | 59 +++++++++++-------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 84ac9b92..3f35b555 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -52,8 +52,12 @@ public class SysDepartServiceImpl extends ServiceImpl queryMyDeptTreeList(String departIds) { //根据部门id获取所负责部门 - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); String[] codeArr = this.getMyDeptParentOrgCode(departIds); + if(codeArr == null){ + //防止出现空指针 + codeArr = new String[0]; + } for(int i=0;i listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); - return listResult; +// List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); + return FindsDepartsChildrenUtil.wrapTreeDataToTreeList(listDepts); } /** @@ -79,25 +83,25 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeList() { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.orderByAsc(SysDepart::getDepartOrder); List list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); - return listResult; +// List listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); + return FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list); } @Cacheable(value = CacheConstant.SYS_DEPART_IDS_CACHE) @Override public List queryDepartIdTreeList() { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.orderByAsc(SysDepart::getDepartOrder); List list = this.list(query); // 调用wrapTreeDataToTreeList方法生成树状数据 - List listResult = FindsDepartsChildrenUtil.wrapTreeDataToDepartIdTreeList(list); - return listResult; +// List listResult = FindsDepartsChildrenUtil.wrapTreeDataToDepartIdTreeList(list); + return FindsDepartsChildrenUtil.wrapTreeDataToDepartIdTreeList(list); } /** @@ -138,11 +142,11 @@ public class SysDepartServiceImpl extends ServiceImpl query = new LambdaQueryWrapper(); - LambdaQueryWrapper query1 = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + LambdaQueryWrapper query1 = new LambdaQueryWrapper<>(); String[] strArray = new String[2]; // 创建一个List集合,存储查询返回的所有SysDepart对象 - List departList = new ArrayList<>(); + List departList ; // 定义新编码字符串 String newOrgCode = ""; // 定义旧编码字符串 @@ -155,7 +159,7 @@ public class SysDepartServiceImpl extends ServiceImpl ids) { - List idList = new ArrayList(); + List idList = new ArrayList<>(); for(String id: ids) { idList.add(id); this.checkChildrenExists(id, idList); @@ -254,7 +258,7 @@ public class SysDepartServiceImpl extends ServiceImpl searhBy(String keyWord,String myDeptSearch,String departIds) { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); List newList = new ArrayList<>(); //myDeptSearch不为空时为我的部门搜索，只搜索所负责部门 if(!StringUtil.isNullOrEmpty(myDeptSearch)){ @@ -264,6 +268,9 @@ public class SysDepartServiceImpl extends ServiceImpl departList = this.list(query); - if(departList.size() > 0) { + if(!departList.isEmpty()) { for(SysDepart depart : departList) { SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); // 将sysDepart转换为sysDepartTreeModel @@ -333,7 +340,7 @@ public class SysDepartServiceImpl extends ServiceImpl containParentDeptUser) { for (SysUser sysUser : containParentDeptUser) { - List headDepartList = new ArrayList(Arrays.asList(sysUser.getDepartIds().split(","))); + List headDepartList = new ArrayList<>(Arrays.asList(sysUser.getDepartIds().split(","))); // 遍历负责部门的list，如果存在本次删除id，则从list中移除 int headDepartNum = headDepartList.size(); for (int i = 0; i < headDepartNum; i++) { @@ -355,10 +362,10 @@ public class SysDepartServiceImpl extends ServiceImpl idList) { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysDepart::getParentId,id); List departList = this.list(query); - if(departList != null && departList.size() > 0) { + if(departList != null && !departList.isEmpty()) { for(SysDepart depart : departList) { idList.add(depart.getId()); this.checkChildrenExists(depart.getId(), idList); @@ -383,18 +390,18 @@ public class SysDepartServiceImpl extends ServiceImpl query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.in(SysDepart::getId, Arrays.asList(departIds.split(","))); query.orderByAsc(SysDepart::getOrgCode); List list = this.list(query); //查找根部门 - if(list == null || list.size()==0){ + if(list == null || list.isEmpty()){ return null; } String orgCode = this.getMyDeptParentNode(list); - String[] codeArr = orgCode.split(","); - return codeArr; +// String[] codeArr = orgCode.split(","); + return orgCode.split(","); } /** @@ -446,7 +453,7 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeByKeyWord(String keyWord) { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.orderByAsc(SysDepart::getDepartOrder); List list = this.list(query);