no message

models/article.go

@@ -214,12 +214,11 @@ func GetArticleDetailByIdStr(articleIdStr string) (items []*ArticleDetail, err e
 func GetArticlePermission(companyId int) (item *ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			b.* 
+			a.chart_permission_name as permission_name
 			FROM
 			cygx_report_mapping AS a
-			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id 
 			WHERE
-			a.category_id = ?`
+			a.category_id = ? LIMIT 1 `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	//_, err = o.Raw(sql, companyId).QueryRows(&item)
 	return

models/report_mapping.go

@@ -136,7 +136,7 @@ func GetdetailByCategoryIdSet(categoryId int) (ids string, err error) {
 // 通过分类ID获取详情
 func GetdetailByCategoryIdPush(categoryId int) (item *ReportMapping, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_report_mapping WHERE category_id=? `
+	sql := `SELECT * FROM cygx_report_mapping WHERE category_id=?  LIMIT 1 `
 	err = o.Raw(sql, categoryId).QueryRow(&item)
 	return
 }

services/article.go

@@ -674,13 +674,14 @@ func GetArticleListByApi(cont context.Context) (err error) {
 	return
 }
 
-func init122() {
-	allList, err := models.GetArticleAll()
-
-	fmt.Println(err)
-	for _, v := range allList {
-		HandleArticleListByApi(v.ArticleId)
-	}
+func init() {
+	//allList, err := models.GetArticleAll()
+	//
+	//fmt.Println(err)
+	//for _, v := range allList {
+	//	HandleArticleListByApi(v.ArticleId)
+	//}
+	//HandleArticleListByApi(7930)
 
 }
 
@@ -1198,6 +1199,8 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	}
 	if reportMapDetail.ChartPermissionId == utils.CE_LUE_ID {
 		chartPermissionId = utils.CE_LUE_ID
+	} else if reportMapDetail.ChartPermissionId == utils.GU_SHOU_ID {
+		chartPermissionId = utils.GU_SHOU_ID
 	} else {
 		if reportMapDetail.PermissionType == 1 {
 			chartPermissionName = reportMapDetail.ChartPermissionName + "(主观)"
@@ -1214,7 +1217,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	//文章关联的产业
 	var industryName string
 	var industrialManagementId string
-	if chartPermissionId == utils.CE_LUE_ID {
+	if chartPermissionId == utils.CE_LUE_ID || chartPermissionId == utils.GU_SHOU_ID {
 		industryName = reportMapDetail.SubCategoryName
 	} else {
 		detailIndustryNameList, err := models.GetIndustrialManagemenDetailByAaticleID(articleId)
@@ -1312,7 +1315,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	}
 	//获取关注这个文章对应产业的用户的 openid
 	mapOpenidFllow := make(map[int]string)
-	if chartPermissionId != utils.CE_LUE_ID {
+	if chartPermissionId != utils.CE_LUE_ID && chartPermissionId != utils.GU_SHOU_ID {
 		openidFllowList, err := models.GetCygxUserFllowOpenid(articleId)
 		if err != nil {
 			return err
@@ -1359,7 +1362,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	keyword4 := articleInfo.Abstract
 	mapAlreadySend := make(map[int]int)
 	//如果是策略就按照策略的推送方式来写
-	if reportMapDetail.ChartPermissionName == utils.CE_LUE_NAME {
+	if reportMapDetail.ChartPermissionName == utils.CE_LUE_NAME || reportMapDetail.ChartPermissionName == utils.GU_SHOU_NAME {
 		//获取提交过推送规则的用户的 openid
 		mapUserFllowCeLue := make(map[int]string)
 		userFllowCeLueList, err := models.GetCygxUserFllowCeLueOpenid(articleInfo.CategoryId)