|
|
@@ -869,7 +869,7 @@ type ArticleResearchResp struct {
|
|
|
SpecialColumnId int `description:"专栏栏目id"`
|
|
|
TopTime int `description:"置顶时间"`
|
|
|
Resource int `description:"来源类型，1：文章、2：产品内测、3：FICC研报"`
|
|
|
- ResourceObj string `description:"来源类型，1：文章、2：产品内测、3：FICC研报"`
|
|
|
+ ResourceObj string `description:"articleficc:FICC研报、articlevmp:上海策略平台报告、articleyx:研选报告、articlespecial:研选专栏"`
|
|
|
ReportId int `description:"FICC研报ID"`
|
|
|
}
|
|
|
|
|
|
@@ -1043,7 +1043,7 @@ func GetArticleResearchAndYxSpecialList(condition, conditionYxSpecial string, pa
|
|
|
cygx_article AS a
|
|
|
LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
|
|
|
LEFT JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id
|
|
|
- INNER JOIN cygx_article_department AS d ON d.department_id = a.department_id
|
|
|
+ LEFT JOIN cygx_article_department AS d ON d.department_id = a.department_id
|
|
|
WHERE
|
|
|
1 = 1 AND a.publish_status = 1 `
|
|
|
if condition != "" {
|
