|
|
@@ -96,7 +96,6 @@ func GetConditionInitByTagIds(tagIds string, chartPermissionId int) (conditionIn
|
|
|
tagType = tagInfo.TagType
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
switch tagType {
|
|
|
case 0: // 无固定标签
|
|
|
//拼接search_tag 搜索内容
|
|
|
@@ -182,8 +181,9 @@ func GetConditionInitByTagIds(tagIds string, chartPermissionId int) (conditionIn
|
|
|
resourceDataIdStrs = append(resourceDataIdStrs, strconv.Itoa(v))
|
|
|
resourceDataIdMap[v] = true
|
|
|
}
|
|
|
- conditionInit += " AND id IN (" + strings.Join(resourceDataIdStrs, ",") + ") OR IF ( source IN ('ficcreport') , search_tag IN ('黑色调研') ,1=1 ) "
|
|
|
+ conditionInit += " AND id IN (" + strings.Join(resourceDataIdStrs, ",") + ") "
|
|
|
}
|
|
|
+ //conditionInit += " OR IF ( source IN ('ficcreport') , tag_name IN ('纪要') ,1=1 ) "
|
|
|
case 1: // 热门活动
|
|
|
conf, e := models.GetConfigByCode(utils.CYGX_TAG_HOT_ACTIVITY_ID)
|
|
|
if e != nil {
|
|
|
@@ -275,7 +275,7 @@ func GetConditionInitByTagIds(tagIds string, chartPermissionId int) (conditionIn
|
|
|
for _, v := range articleList {
|
|
|
articleIds = append(articleIds, strconv.Itoa(v.ArticleId))
|
|
|
}
|
|
|
- conditionInit = " AND source IN ('article','ficcreport') AND IF ( source = 'article' , source_id IN ( " + strings.Join(articleIds, ",") + ") ,1=1 ) AND IF ( source = 'ficcreport' , search_tag IN ('晨会纪要','大类资产周报') ,1=1 ) "
|
|
|
+ conditionInit = " AND source IN ('article','ficcreport') AND IF ( source = 'article' , source_id IN ( " + strings.Join(articleIds, ",") + ") ,1=1 ) AND IF ( source = 'ficcreport' , tag_name IN ('跟踪') ,1=1 ) "
|
|
|
}
|
|
|
|
|
|
return
|
xingzai