|
|
@@ -949,7 +949,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
|
|
|
sql1 += fmt.Sprintf(` AND b.seller_id in (%s) `, sellerId)
|
|
|
}
|
|
|
if researcherId != "" {
|
|
|
- sql1 += fmt.Sprintf(` AND b.researcher_id in (%s) `, sellerId)
|
|
|
+ sql1 += fmt.Sprintf(` AND b.researcher_id in (%s) `, researcherId)
|
|
|
}
|
|
|
sql2 := fmt.Sprintf(`SELECT bb.seller_id,bb.seller_name,bb.researcher_name,aa.company_name,aa.company_id,cc.overseas_status,bb.roadshow_type,aa.theme,aa.roadshow_platform,aa.province as province,aa.city as city FROM rs_calendar AS aa
|
|
|
INNER JOIN rs_report_record AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
|
|
|
@@ -973,7 +973,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
|
|
|
sql2 += fmt.Sprintf(` AND bb.seller_id in (%s) `, sellerId)
|
|
|
}
|
|
|
if researcherId != "" {
|
|
|
- sql2 += fmt.Sprintf(` AND bb.researcher_id in (%s) `, sellerId)
|
|
|
+ sql2 += fmt.Sprintf(` AND bb.researcher_id in (%s) `, researcherId)
|
|
|
}
|
|
|
// 列表数据
|
|
|
sql := `SELECT m.* FROM (` + sql1 + ` UNION ALL ` + sql2
|
zwxi