|
|
@@ -182,7 +182,7 @@ func GetConditionInitByTagIds(tagIds string, chartPermissionId int) (conditionIn
|
|
|
resourceDataIdStrs = append(resourceDataIdStrs, strconv.Itoa(v))
|
|
|
resourceDataIdMap[v] = true
|
|
|
}
|
|
|
- conditionInit += " AND id IN (" + strings.Join(resourceDataIdStrs, ",") + ") "
|
|
|
+ conditionInit += " AND id IN (" + strings.Join(resourceDataIdStrs, ",") + ") OR IF ( source IN ('ficcreport') , search_tag IN ('黑色调研') ,1=1 ) "
|
|
|
}
|
|
|
case 1: // 热门活动
|
|
|
conf, e := models.GetConfigByCode(utils.CYGX_TAG_HOT_ACTIVITY_ID)
|
|
|
@@ -270,7 +270,7 @@ func GetConditionInitByTagIds(tagIds string, chartPermissionId int) (conditionIn
|
|
|
for _, v := range articleList {
|
|
|
articleIds = append(articleIds, strconv.Itoa(v.ArticleId))
|
|
|
}
|
|
|
- conditionInit = " AND source_id IN ( " + strings.Join(articleIds, ",") + ") AND source = '" + utils.CYGX_OBJ_ARTICLE + "'"
|
|
|
+ conditionInit = " AND source_id IN ( " + strings.Join(articleIds, ",") + ") AND source = '" + utils.CYGX_OBJ_ARTICLE + "' OR IF ( source IN ('ficcreport') , search_tag IN ('晨会纪要','大类资产周报') ,1=1 )"
|
|
|
}
|
|
|
|
|
|
return
|
xingzai