Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

services/tag.go

@@ -108,7 +108,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 
 	case "纪要": //纪要
 
-		condition = ` AND  article_type_id > 0  AND  article_type_id != 12  `
+		condition = ` AND  article_type_id > 0   `
 		list, e := models.GetCygxCygxArticleIdList(condition, pars)
 		if e != nil {
 			err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
@@ -118,16 +118,16 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 			yanxuanArticleIds = append(yanxuanArticleIds, v.ArticleId)
 		}
 
-	case "买方沙龙": // 买方沙龙
-		condition = `  AND  article_type_id = 12  `
-		list, e := models.GetCygxCygxArticleIdList(condition, pars)
-		if e != nil {
-			err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
-			return
-		}
-		for _, v := range list {
-			yanxuanArticleIds = append(yanxuanArticleIds, v.ArticleId)
-		}
+		//case "买方沙龙": // 买方沙龙
+		//	condition = `  AND  article_type_id = 12  `
+		//	list, e := models.GetCygxCygxArticleIdList(condition, pars)
+		//	if e != nil {
+		//		err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
+		//		return
+		//	}
+		//	for _, v := range list {
+		//		yanxuanArticleIds = append(yanxuanArticleIds, v.ArticleId)
+		//	}
 	}
 
 	yanxuanActivityIdsPerssion := GetYanxuanActivityIds(user, 1) // 获取所有有权限的研选活动ID