|
@@ -337,7 +337,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
|
|
|
sql := `SELECT m.* FROM (` + sql1 + ` UNION ALL ` + sql2
|
|
sql := `SELECT m.* FROM (` + sql1 + ` UNION ALL ` + sql2
|
|
|
sql += ` ) AS m WHERE 1=1 `
|
|
sql += ` ) AS m WHERE 1=1 `
|
|
|
|
|
|
|
|
- sql += ` Group by rs_calendar_id `
|
|
|
|
|
|
|
+ sql += ` Group by admin_id `
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&list)
|
|
_, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
|
|
|
|
|
return
|
|
return
|
zwxi