From 2dd41fb2855edeff53dbdfc2e2592be28688b757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 10 Mar 2023 15:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysDictServiceImpl?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysDictServiceImpl.java      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
index 0764f9f9..a1e0b9f5 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
@@ -20,6 +20,7 @@ import com.jero.modules.system.mapper.SysDictMapper;
 import com.jero.modules.system.model.TreeSelectModel;
 import com.jero.modules.system.service.ISysDictService;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -274,7 +275,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	private String getFilterSql(String text, String code, String condition, String keyword){
 		String keywordSql = null;
 		String filterSql = "";
-		String sql_where = " where ";
+		String sqlWhere = " where ";
 		if(oConvertUtils.isNotEmpty(keyword)){
 			// 判断是否是多选
 			if (keyword.contains(",")) {
@@ -285,11 +286,11 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 			}
 		}
 		if(oConvertUtils.isNotEmpty(condition) && oConvertUtils.isNotEmpty(keywordSql)){
-			filterSql+= sql_where + condition + " and " + keywordSql;
+			filterSql+= sqlWhere + condition + " and " + keywordSql;
 		}else if(oConvertUtils.isNotEmpty(condition)){
-			filterSql+= sql_where + condition;
+			filterSql+= sqlWhere + condition;
 		}else if(oConvertUtils.isNotEmpty(keywordSql)){
-			filterSql+= sql_where + keywordSql;
+			filterSql+= sqlWhere + keywordSql;
 		}
 		return filterSql;
 	}
@@ -297,7 +298,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	@Override
 	public List<DictModel> queryAllTableDictItems(String table, String text, String code, String condition, String keyword) {
 		String filterSql = getFilterSql(text, code, condition, keyword);
-//		List<DictModel> ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql);
 		return baseMapper.queryAllTableDictItems(table, text, code, filterSql);
 	}
 
@@ -334,11 +334,17 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 			}
 		}
 		log.info("aaa");
+		List<TreeSelectModel> treeNodeList = getTreeSelectModels(resultMap);
 
+		return treeNodeList;
+	}
+
+	@NotNull
+	private List<TreeSelectModel> getTreeSelectModels(HashMap<String, TreeSelectModel> resultMap) {
 		// 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点
 		List<TreeSelectModel> treeNodeList = new ArrayList<>();
-		for (String key : resultMap.keySet()){
-			TreeSelectModel curTreeSelectModel = resultMap.get(key);
+		for (Map.Entry<String, TreeSelectModel> entry : resultMap.entrySet()){
+			TreeSelectModel curTreeSelectModel = entry.getValue();
 			if (StringUtils.isEmpty(curTreeSelectModel.getParentId())){
 				treeNodeList.add(curTreeSelectModel);
 			} else {
@@ -349,7 +355,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 				}
 			}
 		}
-
 		return treeNodeList;
 	}