修改分类

controllers/english_report/report.go

@@ -1212,22 +1212,22 @@ func (this *EnglishReportController) ClassifyIdDetail() {
 	if item != nil {
 		item.Content = html.UnescapeString(item.Content)
 		item.ContentSub = html.UnescapeString(item.ContentSub)
-	}
-	classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
-	if item.ClassifyIdSecond > 0 {
-		nameList, tErr := models.GetEnglishClassifyFullNameByIds([]int{item.ClassifyIdSecond})
-		if tErr != nil {
-			br.Msg = "获取分类名称失败"
-			br.ErrMsg = "获取分类名称失败, ERR:" + tErr.Error()
-			return
-		}
-		for _, v := range nameList {
-			classifyNameMap[v.Id] = v
-		}
-		//处理分类名
-		if n, ok := classifyNameMap[item.ClassifyIdSecond]; ok {
-			item.ClassifyNameRoot = n.RootName
-			item.ClassifyIdRoot = n.RootId
+		classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
+		if item.ClassifyIdSecond > 0 {
+			nameList, tErr := models.GetEnglishClassifyFullNameByIds([]int{item.ClassifyIdSecond})
+			if tErr != nil {
+				br.Msg = "获取分类名称失败"
+				br.ErrMsg = "获取分类名称失败, ERR:" + tErr.Error()
+				return
+			}
+			for _, v := range nameList {
+				classifyNameMap[v.Id] = v
+			}
+			//处理分类名
+			if n, ok := classifyNameMap[item.ClassifyIdSecond]; ok {
+				item.ClassifyNameRoot = n.RootName
+				item.ClassifyIdRoot = n.RootId
+			}
 		}
 	}
 

models/english_report.go

@@ -412,17 +412,17 @@ 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
-                   WHERE root_id>0 AND classify_name LIKE '%` + keyWord + `%')
+                   WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%')
                    )AS t
                    ORDER BY sort ASC,create_time ASC
                    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
@@ -434,15 +434,15 @@ func GetEnglishClassifyListCount(keyWord string) (count int, err error) {
 	if keyWord != "" {
 		sqlCount = `SELECT  COUNT(1) AS count 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
-               WHERE root_id>0 AND classify_name LIKE '%` + keyWord + `%')
+               WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%')
                )AS t `
 		err = o.Raw(sqlCount).QueryRow(&count)
 	} else {
-		sqlCount = `SELECT COUNT(1) AS count FROM english_classify WHERE root_id=0`
+		sqlCount = `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0`
 		err = o.Raw(sqlCount).QueryRow(&count)
 	}
 
@@ -459,10 +459,10 @@ FROM
 	english_classify a
 	LEFT JOIN english_classify b ON a.root_id = b.id
 	LEFT JOIN english_classify c ON a.parent_id = c.id
-	WHERE a.classify_name LIKE '%` + keyWord + `%' and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
+	WHERE a.parent_id >0 and a.classify_name LIKE '%` + keyWord + `%' and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
 		_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
+		sql = `SELECT * FROM english_classify WHERE parent_id >0 and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
 		_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	}
 	return
@@ -586,7 +586,7 @@ func GetEnglishClassifyCountsByName(name string, parentId int) (count int, err e
 // GetEnglishFirstClassifyList 获取一级、二级分类列表
 func GetEnglishFirstClassifyList(startSize, pageSize int) (items []*EnglishClassifyList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	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
 }
@@ -594,14 +594,14 @@ func GetEnglishFirstClassifyList(startSize, pageSize int) (items []*EnglishClass
 // GetEnglishSecondClassifyList 获取一级、二级分类列表
 func GetEnglishSecondClassifyList(rootIds []int) (items []*EnglishClassifyList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM english_classify WHERE root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) and root_id>0 and root_id=parent_id ORDER BY sort ASC,create_time ASC`
+	sql := `SELECT * FROM english_classify WHERE root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) and parent_id>0 and root_id=parent_id ORDER BY sort ASC,create_time ASC`
 	_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	return
 }
 
 func GetEnglishFirstClassifyListCount() (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sqlCount := `SELECT COUNT(1) AS count FROM english_classify WHERE root_id=0`
+	sqlCount := `SELECT COUNT(1) AS count FROM english_classify WHERE parent_id=0`
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }