Merge branch 'CRM_14.0' into debug

controllers/help_doc/classify.go

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