Browse Source

修改group

hongze 5 months ago
parent
commit
88c580f332
1 changed files with 10 additions and 2 deletions
  1. 10 2
      models/data_manage/my_chart.go

+ 10 - 2
models/data_manage/my_chart.go

@@ -689,7 +689,8 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 	//sql += ` GROUP BY a.chart_info_id  `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	sql := `SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
+	sql := `SELECT a.my_chart_id,a.chart_info_id,a.source,a.admin_id,a.create_time,a.modify_time,LISTAGG(c.my_chart_classify_id, ',') WITHIN GROUP (ORDER BY c.my_chart_classify_id) AS my_chart_classify_id
+            FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
 			LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
 			WHERE 1=1 
@@ -697,7 +698,14 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY a.chart_info_id  `
+	sql += ` GROUP BY   
+    a.chart_info_id,
+    a.my_chart_id,
+    a.chart_info_id,
+    a.source,
+    a.admin_id,
+    a.create_time,
+    a.modify_time  `
 	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }