Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -33,12 +33,7 @@ public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Integer, HelpC
 		List<HelpCenterCatalog> dataList = helpCenterCatalogDao.queryByParentId(parentId, status);
 		if (dataList != null) {
 			for (HelpCenterCatalog sub : dataList) {
-				List<HelpCenterCatalog> subList = helpCenterCatalogDao.queryByParentId(sub.getId(), status);
-				if (subList == null) {
-					continue;
-				}
-				sub.setChildren(subList);
-				queryByParentId(sub.getId(), status);
+				sub.setChildren(queryByParentId(sub.getId(), status));
 			}
 		}
 		return dataList;