|
|
@@ -1215,14 +1215,15 @@ FROM
|
|
|
cam.industrial_management_id = ? AND cam.source = 1 UNION ALL
|
|
|
SELECT
|
|
|
ca.activity_id AS id,
|
|
|
+ 0 as article_id,
|
|
|
cavo.voice_name AS title,
|
|
|
'' AS video_url,
|
|
|
ca.activity_time AS publish_time,
|
|
|
- cavo.voice_name AS voice_url,
|
|
|
+ cavo.voice_url AS voice_url,
|
|
|
'' AS sub_category_name,
|
|
|
'' AS content,
|
|
|
5 AS resource,
|
|
|
- ( SELECT COUNT( 1 ) FROM cygx_activity_video_history AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.activity_id = ca.activity_id ) AS readnum
|
|
|
+ ( SELECT COUNT( 1 ) FROM cygx_activity_voice_history AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.activity_id = ca.activity_id ) AS readnum
|
|
|
FROM
|
|
|
cygx_activity AS ca
|
|
|
INNER JOIN cygx_activity_voice AS cavo ON ca.activity_id = cavo.activity_id
|
ziwen