fix

controllers/help_doc/classify.go

@@ -44,15 +44,34 @@ func (this *HelpDocClassifyController) ListClassify() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-
+	rootListAll := make([]help_doc.HelpDocClassifyItems,0)
+	rootListAll = rootList
 	nodeAll := make([]*help_doc.HelpDocClassifyItems, 0)
-	for k := range rootList {
-		rootNode := rootList[k]
-		data.HelpDocClassifyItemsMakeTree(classifyAll, rootNode)
-		nodeAll = append(nodeAll, rootNode)
+	for k := range rootListAll {
+		rootNode := rootListAll[k]
+		data.HelpDocClassifyItemsMakeTree(classifyAll, &rootNode)
+		nodeAll = append(nodeAll, &rootNode)
+	}
+
+	//添加分类用，只有一二级目录
+	classifyLevel, err := help_doc.GetHelpDocClassifyLevel()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
 	}
+	rootListLevel := make([]help_doc.HelpDocClassifyItems,0)
+	rootListLevel = rootList
+	nodeAllTwoLevel := make([]*help_doc.HelpDocClassifyItems, 0)
+	for k := range rootListLevel {
+		rootNode := rootListLevel[k]
+		data.HelpDocClassifyItemsMakeTree(classifyLevel, &rootNode)
+		nodeAllTwoLevel = append(nodeAllTwoLevel, &rootNode)
+	}
+
 
 	resp.AllNodes = nodeAll
+	resp.TwoLevelNodes = nodeAllTwoLevel
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -178,22 +197,12 @@ func (this *HelpDocClassifyController) EditClassify() {
 			return
 		}
 
-		err = help_doc.EditHelpDocClassify(req.HelpDocClassifyId,req.ParentId, req.HelpDocClassifyName)
+		err = help_doc.EditHelpDocClassify(req.HelpDocClassifyId, req.HelpDocClassifyName)
 		if err != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "保存失败,Err:" + err.Error()
 			return
 		}
-
-		// 修改文档中的分类名
-		if req.HelpDocClassifyName != item.ClassifyName {
-			err = help_doc.EditHelpDocClassifyId(req.HelpDocClassifyId, req.HelpDocClassifyName)
-			if err != nil {
-				br.Msg = "保存失败"
-				br.ErrMsg = "保存失败,Err:" + err.Error()
-				return
-			}
-		}
 	}
 	br.Ret = 200
 	br.Msg = "保存成功"

controllers/help_doc/doc.go

@@ -240,6 +240,7 @@ func (this *HelpDocController) ListReport() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
 	resp := new(help_doc.HelpDocListResp)
 	for _, item := range list {
 		var anchor []help_doc.AnchorList

models/help_doc/classify.go

@@ -40,7 +40,6 @@ func GetHelpDocClassifyCount(HelpDocClassifyName string, parentId int) (count in
 type EditHelpDocClassifyReq struct {
 	HelpDocClassifyName string `description:"分类名称"`
 	HelpDocClassifyId   int    `description:"分类id"`
-	ParentId            int    `description:"父级id"`
 }
 
 func GetHelpDocClassifyById(classifyId int) (item *HelpDocClassify, err error) {
@@ -57,10 +56,10 @@ func GetHelpDocClassifyCountById(classifyId int) (count int, err error) {
 	return
 }
 
-func EditHelpDocClassify(classifyId, parentId int, HelpDocClassifyName string) (err error) {
+func EditHelpDocClassify(classifyId int, HelpDocClassifyName string) (err error) {
 	o := orm.NewOrm()
-	sql := `UPDATE help_doc_classify SET classify_name=?,parent_id = ?, modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, HelpDocClassifyName, parentId, classifyId).Exec()
+	sql := `UPDATE help_doc_classify SET classify_name=?, modify_time=NOW() WHERE classify_id=? `
+	_, err = o.Raw(sql, HelpDocClassifyName, classifyId).Exec()
 	return
 }
 
@@ -83,7 +82,7 @@ func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
 }
 
 // GetHelpDocClassifyByParentId
-func GetHelpDocClassifyByParentId(parentId int, keyWord string) (items []*HelpDocClassifyItems, err error) {
+func GetHelpDocClassifyByParentId(parentId int, keyWord string) (items []HelpDocClassifyItems, err error) {
 	o := orm.NewOrm()
 	sql := ``
 	if keyWord != ""{
@@ -122,6 +121,7 @@ type HelpDocClassifyItems struct {
 
 type HelpDocClassifyListResp struct {
 	AllNodes []*HelpDocClassifyItems
+	TwoLevelNodes []*HelpDocClassifyItems
 }
 
 type HelpDocClassifyDeleteCheckResp struct {
@@ -263,4 +263,14 @@ type MoveClassifyReq struct {
 	ParentClassifyId int `description:"父级分类id"`
 	PrevClassifyId   int `description:"上一个兄弟节点分类id"`
 	NextClassifyId   int `description:"下一个兄弟节点分类id"`
+}
+
+
+// GetHelpDocClassifyLevel
+func GetHelpDocClassifyLevel() (items []*HelpDocClassifyItems, err error) {
+	o := orm.NewOrm()
+	sql := ``
+	sql = ` SELECT * FROM help_doc_classify WHERE level IN (1,2) `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
 }

models/help_doc/help_doc.go

@@ -142,7 +142,7 @@ func GetHelpDocList(condition string, pars []interface{}, startSize, pageSize in
 	if condition != "" {
 		sql += condition
 	}
-	sql += `ORDER BY modify_time DESC LIMIT ?,?`
+	sql += `ORDER BY create_time DESC LIMIT ?,?`
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }