no message

controllers/chart_permission.go

@@ -172,31 +172,31 @@ func (this *ChartPermissionAuthController) StrategyDetail() {
 	if chartPermissionId == 0 {
 		chartPermissionId = utils.CE_LUE_ID
 	}
-	uid := user.UserId
-	list, err := models.GetReportMappingStrategyHomeAll(chartPermissionId)
+	//uid := user.UserId
+	list, err := models.GetReportMappingStrategyHomeAllByCygx(chartPermissionId)
 
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	for k, v := range list {
-		count, err := models.GetUserIsReadThisNewCategoryArticleCount(v.CategoryId, uid)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败，Err:" + err.Error()
-			return
-		}
-		Newdetail, err := models.GetNewArticleByCategoryId(v.CategoryId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取信息失败,Err:" + err.Error()
-			return
-		}
-		if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
-			list[k].IsRed = true
-		}
-	}
+	//for k, v := range list {
+	//	count, err := models.GetUserIsReadThisNewCategoryArticleCount(v.CategoryId, uid)
+	//	if err != nil && err.Error() != utils.ErrNoRow() {
+	//		br.Msg = "获取信息失败"
+	//		br.ErrMsg = "获取品种信息失败，Err:" + err.Error()
+	//		return
+	//	}
+	//	Newdetail, err := models.GetNewArticleByCategoryId(v.CategoryId)
+	//	if err != nil {
+	//		br.Msg = "获取信息失败"
+	//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
+	//		list[k].IsRed = true
+	//	}
+	//}
 	cf, err := models.GetConfigByCode(utils.CYGX_TACTICS_TIME_LINE_STATUS)
 	if err != nil {
 		br.Msg = "获取失败"

models/report_mapping.go

@@ -94,6 +94,29 @@ ORDER BY
 	return
 }
 
+// 获取策略下面的所有分类
+func GetReportMappingStrategyHomeAllByCygx(chartPermissionId int) (items []*ReportMappingHome, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	re.id AS category_id,
+	re.match_type_name 
+FROM
+	cygx_report_mapping_cygx AS re
+	INNER JOIN cygx_report_mapping_group AS mg ON mg.id_cygx = re.id
+	INNER JOIN cygx_article AS art ON art.category_id = mg.category_id_celue 
+WHERE
+	1 = 1 
+	AND re.chart_permission_id = ? 
+	AND re.report_type = 1 
+GROUP BY
+	re.match_type_name 
+ORDER BY
+	sort DESC,
+	art.publish_date DESC`
+	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
+	return
+}
+
 // 行业列表
 func GetTradeAll(ChartPermissionId int) (items []*TradeReportMapping, err error) {
 	o := orm.NewOrm()