Commit 35bdd203 authored by 王锦盛's avatar 王锦盛

Merge remote-tracking branch 'origin/master'

parents fbe48349 ab3f8c52
...@@ -164,10 +164,10 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -164,10 +164,10 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
for (OcpModelGroupVO vo : groupList) { for (OcpModelGroupVO vo : groupList) {
//遍历出父id等于参数的id,add进子节点集合 //遍历出父id等于参数的id,add进子节点集合
if (parent != null if (parent != null
&& parent.getModelGroupCode() && parent.getModelGroupCode()
.equals(vo.getModelGroupPcode()) .equals(vo.getModelGroupPcode())
&& !"".equals(parent.getModelGroupCode()) && !"".equals(parent.getModelGroupCode())
&& !parent.getModelGroupCode().equals(vo.getModelGroupCode())) { && !parent.getModelGroupCode().equals(vo.getModelGroupCode())) {
parent.setHasChildren(true); parent.setHasChildren(true);
vo.setModelGroupPName(parent.getModelGroupName()); vo.setModelGroupPName(parent.getModelGroupName());
if (!childList.remove(vo)) { if (!childList.remove(vo)) {
...@@ -229,7 +229,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -229,7 +229,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>(); QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>();
//根据是否传入搜索条件创建构造器进行查询 //根据是否传入搜索条件创建构造器进行查询
queryWrapper.eq(StringUtils.isNotEmpty(searchCondition[0]), "model_group_pcode", searchCondition[0]) queryWrapper.eq(StringUtils.isNotEmpty(searchCondition[0]), "model_group_pcode", searchCondition[0])
.like(StringUtils.isNotEmpty(searchCondition[1]),"model_group_name", searchCondition[1]); .like(StringUtils.isNotEmpty(searchCondition[1]),"model_group_name", searchCondition[1]);
return classifyMapper.selectList(queryWrapper); return classifyMapper.selectList(queryWrapper);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment