no message

controllers/report.go

@@ -401,26 +401,9 @@ func (this *MobileReportController) ArticleCategoryList() {
 		}
 		categoryMap[v.CategoryId] = v.CategoryId
 		list = append(list, v)
-		//recordCount, err := models.IndustrialUserRecordArticleCount(uid, industrialManagementId, v.CategoryId)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		//	return
-		//}
-		//Newdetail, err := models.GetNewIndustrialUserRecordArticle(industrialManagementId, v.CategoryId)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		//	return
-		//}
-		//if Newdetail != nil {
-		//	if recordCount == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
-		//		list[k].IsRed = true
-		//	}
-		//}
 	}
 	//标的列表
-	industrialSubjectList, err := models.GetIndustrialSubjectAll(industrialManagementId)
+	industrialSubjectList, err := models.GetIndustrialArticleGroupSubjectListByHz(industrialManagementId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()

models/industrial_article_group_subject.go

@@ -0,0 +1,23 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+)
+
+// 标的列表
+func GetIndustrialArticleGroupSubjectListByHz(IndustrialManagementId int) (items []*IndustrialSubject, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			i.* 
+		FROM
+			cygx_industrial_subject AS i
+			INNER JOIN cygx_industrial_article_group_subject AS sg ON sg.industrial_subject_id = i.industrial_subject_id
+			INNER JOIN cygx_article AS a ON a.article_id = sg.article_id 
+		WHERE
+			i.industrial_management_id = ? 
+			AND a.article_type_id = 0 
+		GROUP BY
+			i.industrial_subject_id `
+	_, err = o.Raw(sql, IndustrialManagementId).QueryRows(&items)
+	return
+}