Merge branch 'CRM_14.0' into debug

controllers/help_doc/classify.go

@@ -99,10 +99,7 @@ func (this *HelpDocClassifyController) ListClassify() {
 		}
 		// 重新组合 newClassifyAll
 		for _, v := range keywordClassify {
-			if v.ParentId == 3 {
-				newClassifyAll = append(newClassifyAll, v)
-				newClassifyAll = append(newClassifyAll, classifyAllMap[v.ParentId])
-			} else if v.ParentId == 2 {
+			if v.Level != 1 {
 				newClassifyAll = append(newClassifyAll, v)
 			}
 		}