..

controllers/english_report/english_classify.go

@@ -96,9 +96,11 @@ func (this *EnglishReportController) ListClassify() {
 		for _, v := range idList {
 			if _, ok := childIdMap[v.ParentId]; !ok {
 				ids = append(ids, v.ParentId)
+				childIdMap[v.ParentId] = struct{}{}
 			}
 			if _, ok := childIdMap[v.Id]; !ok {
 				ids = append(ids, v.Id)
+				childIdMap[v.ParentId] = struct{}{}
 			}
 		}
 		tmpList, err := models.GetEnglishClassifyChildByIds(ids)

models/english_report.go

@@ -123,7 +123,7 @@ func GetEnglishClassifyRootId(startSize, pageSize int, keyWord string) (items []
 	if keyWord != "" {
 		sql = `SELECT * FROM (
 			                   SELECT * FROM english_classify
-                   WHERE root_id=0 AND classify_name LIKE '%` + keyWord + `%'
+                   WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%'
                    UNION
                    SELECT * FROM english_classify
                    WHERE id IN(SELECT parent_id FROM english_classify
@@ -133,7 +133,7 @@ func GetEnglishClassifyRootId(startSize, pageSize int, keyWord string) (items []
                    LIMIT ?,? `
 		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE root_id=0 ORDER BY sort ASC,create_time ASC LIMIT ?,? `
+		sql = `SELECT * FROM english_classify WHERE parent_id=0 ORDER BY sort ASC,create_time ASC LIMIT ?,? `
 		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	}
 	return