Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java

@@ -164,10 +164,10 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         for (OcpModelGroupVO vo : groupList) {
             //遍历出父id等于参数的id，add进子节点集合
             if (parent != null
-                    && parent.getModelGroupCode()
-                    .equals(vo.getModelGroupPcode())
-                    && !"".equals(parent.getModelGroupCode())
-                    && !parent.getModelGroupCode().equals(vo.getModelGroupCode())) {
+                && parent.getModelGroupCode()
+                .equals(vo.getModelGroupPcode())
+                && !"".equals(parent.getModelGroupCode())
+                && !parent.getModelGroupCode().equals(vo.getModelGroupCode())) {
                 parent.setHasChildren(true);
                 vo.setModelGroupPName(parent.getModelGroupName());
                 if (!childList.remove(vo)) {
@@ -229,7 +229,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>();
         //根据是否传入搜索条件创建构造器进行查询
         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);
     }