|
|
@@ -323,7 +323,7 @@ type ChartCollectEsItem struct {
|
|
|
// GetChartCollectByChartInfoIdAndUserIdByCondition 获图表收藏数据
|
|
|
func GetChartCollectByChartInfoIdAndUserIdByCondition(condition string, pars []interface{}) (item []*ChartCollectEsItem, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := ` SELECT a.user_id, CONCAT(a.chart_info_id,"_", a.user_id) as user_chart_info_id, max(a.collect_time) as collect_time,
|
|
|
+ sql := ` SELECT a.user_id, CONCAT(a.user_id,"_", a.chart_info_id) as user_chart_info_id, max(a.collect_time) as collect_time,
|
|
|
b.chart_info_id,b.chart_name,b.chart_name_en,b.chart_image,b.unique_code,b.chart_classify_id,b.sys_user_id,b.sys_user_real_name,b.create_time,b.modify_time,b.source as chart_source,
|
|
|
GROUP_CONCAT(DISTINCT d.classify_name) AS chart_collect_classify_names,GROUP_CONCAT(DISTINCT d.collect_classify_id) AS collect_classify_ids
|
|
|
FROM chart_collect AS a
|
