KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】SysDictServiceImpl文件

Browse Source
This commit is contained in:
梁琦涛
2023-03-10 15:27:09 +08:00
parent 98939eca15
commit 2dd41fb285
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+13 -8
View File
@@ -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;
}