|
@@ -338,8 +338,8 @@ func GetArticleCollectionList(condition string, userId int) (items []*ArticleCol
|
|
|
d.nick_name,
|
|
|
d.department_id,
|
|
|
( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
|
|
|
- ( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id ) AS collect_num,
|
|
|
- ( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id AND user_id = ?) AS my_collect_num
|
|
|
+ ( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user as u ON u.user_id = ac.user_id WHERE ac.article_id = a.article_id ) AS collect_num,
|
|
|
+ ( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id AND user_id = ? ) AS my_collect_num
|
|
|
FROM
|
|
|
cygx_article AS a
|
|
|
INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
|
|
@@ -551,7 +551,7 @@ func GetThemeDetail(userId, industrialManagementId int) (items []*GetThemeDetail
|
|
|
( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
|
|
|
( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id ) AS collect_num,
|
|
|
( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id and user_id = ? ) AS my_collect_num,
|
|
|
- ( SELECT count( 1 ) FROM cygx_industry_fllow AS ac WHERE user_id = ? AND ac.industrial_management_id = m.industrial_management_id AND f.type= 1) AS fllow_num
|
|
|
+ ( SELECT count( 1 ) FROM cygx_industry_fllow AS ac WHERE user_id = ? AND ac.industrial_management_id = m.industrial_management_id AND ac.type= 1) AS fllow_num
|
|
|
FROM
|
|
|
cygx_article AS a
|
|
|
INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
|
|
@@ -600,9 +600,9 @@ func GetDepartmentDetail(userId, departmentId int) (item DepartmentDetail, err e
|
|
|
d.nick_name,
|
|
|
d.img_url,
|
|
|
( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.user_id = ? AND af.department_id = d.department_id AND af.type= 1 ) AS my_fllow_num,
|
|
|
- ( SELECT count( 1 ) FROM cygx_article_department_follow AS f WHERE f.department_id = d.department_id AND f.type= 1 ) AS fllow_num,
|
|
|
+ ( SELECT count( 1 ) FROM cygx_article_department_follow AS f INNER JOIN wx_user as u ON u.user_id = f.user_id WHERE f.department_id = d.department_id AND f.type= 1 ) AS fllow_num,
|
|
|
( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id ) AS article_num,
|
|
|
- ( SELECT count( 1 ) FROM cygx_article_collect AS c WHERE c.article_id IN (SELECT article_id FROM cygx_article AS a WHERE a.department_id = d.department_id )) AS collect_num
|
|
|
+ ( SELECT count( 1 ) FROM cygx_article_collect AS c INNER JOIN wx_user as u ON u.user_id = c.user_id WHERE c.article_id IN (SELECT article_id FROM cygx_article AS a WHERE a.department_id = d.department_id )) AS collect_num
|
|
|
FROM
|
|
|
cygx_article_department AS d
|
|
|
WHERE
|