From 63343886dd163b11ac183847cde5ee655c14ac92 Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Tue, 7 Mar 2023 11:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20SysDictServiceI?=
 =?UTF-8?q?mpl.java=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      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 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 ba3e5415..7914ac22 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
@@ -82,9 +82,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 
 	@Override
 	public Map<String, List<DictModel>> queryAllDictItems() {
-		Map<String, List<DictModel>> res = new HashMap<String, List<DictModel>>();
+		Map<String, List<DictModel>> res = new HashMap<>();
 		List<SysDict> ls = sysDictMapper.selectList(null);
-		LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
+		LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(SysDictItem::getStatus, 1);
 		queryWrapper.orderByAsc(SysDictItem::getSortOrder);
 		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper);
@@ -147,7 +147,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		log.debug("无缓存dictTableList的时候调用这里！");
 		return sysDictMapper.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql);
 	}
-	
+
 	/**
 	 * 通过查询指定table的 text code 获取字典值text
 	 * dictTableCache采用redis缓存有效期10分钟
@@ -200,7 +200,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		// 查询出来的顺序可能是乱的，需要排个序
 		for (String key : keyArray) {
 			List<DictModel> res = dicts.stream().filter(i -> key.equals(i.getValue())).collect(Collectors.toList());
-			if (res.size() > 0) {
+			if (!res.isEmpty()) {
 				texts.add(res.get(0).getText());
 			} else if (!delNotExist) {
 				texts.add(key);
@@ -248,7 +248,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	public List<DictModel> queryAllUserBackDictModel() {
 		return baseMapper.queryAllUserBackDictModel();
 	}
-	
+
 	@Override
 	public List<DictModel> queryTableDictItems(String table, String text, String code, String keyword) {
 		return baseMapper.queryTableDictItems(table, text, code, "%"+keyword+"%");
@@ -256,7 +256,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 
 	@Override
 	public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize) {
-		Page<DictModel> page = new Page<DictModel>(1, pageSize);
+		Page<DictModel> page = new Page<>(1, pageSize);
 		page.setSearchCount(false);
 		String filterSql = getFilterSql(text, code, condition, keyword);
 		IPage<DictModel> pageList = baseMapper.queryTableDictWithFilter(page, table, text, code, filterSql);
@@ -272,11 +272,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 * @return
 	 */
 	private String getFilterSql(String text, String code, String condition, String keyword){
-		String keywordSql = null, filterSql = "", sql_where = " where ";
+		String keywordSql = null;
+		String filterSql = "";
+		String sql_where = " where ";
 		if(oConvertUtils.isNotEmpty(keyword)){
 			// 判断是否是多选
 			if (keyword.contains(",")) {
-				String inKeywords = "\"" + keyword.replaceAll(",", "\",\"") + "\"";
+				String inKeywords = "\"" + keyword.replace(",", "\",\"") + "\"";
 				keywordSql = "(" + text + " in (" + inKeywords + ") or " + code + " in (" + inKeywords + "))";
 			} else {
 				keywordSql = "("+text + " like '%"+keyword+"%' or "+ code + " like '%"+keyword+"%')";
@@ -295,8 +297,8 @@ 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 ls;
+//		List<DictModel> ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql);
+		return baseMapper.queryAllTableDictItems(table, text, code, filterSql);
 	}
 
 	@Override
@@ -331,7 +333,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 				copyTreeSelectModel = newTreeSelectModel;
 			}
 		}
-		System.out.println("aaa");
+		log.info("aaa");
 
 		// 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点
 		List<TreeSelectModel> treeNodeList = new ArrayList<>();