|
@@ -608,10 +608,11 @@ func CygxActivitySpecialTripByCompanyWeekly(condition string, startSize, pageSiz
|
|
r.activity_id,
|
|
r.activity_id,
|
|
r.real_name,
|
|
r.real_name,
|
|
r.company_name,
|
|
r.company_name,
|
|
|
|
+ r.seller_name,
|
|
r.company_id,
|
|
r.company_id,
|
|
r.is_meeting
|
|
r.is_meeting
|
|
FROM
|
|
FROM
|
|
- cygx_activity_special_meeting_detail AS r
|
|
|
|
|
|
+ cygx_activity_special_trip AS r
|
|
INNER JOIN cygx_activity_special AS a ON a.activity_id = r.activity_id
|
|
INNER JOIN cygx_activity_special AS a ON a.activity_id = r.activity_id
|
|
INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id AND us.product_id = 2
|
|
INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id AND us.product_id = 2
|
|
WHERE 1= 1 AND a.publish_status = 1 `
|
|
WHERE 1= 1 AND a.publish_status = 1 `
|