|
@@ -126,11 +126,11 @@ func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLo
|
|
|
//列表
|
|
|
func GetReportSelectionlogSonListAll(articleId, chartPermissionId int) (items []*CygxReportSelectionLogDetail, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := `SELECT c.permission_name ,s.subject_name , l.*
|
|
|
+ sql := `SELECT c.permission_name , l.*
|
|
|
FROM
|
|
|
cygx_report_selection_log AS l
|
|
|
INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id
|
|
|
- INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id
|
|
|
+ LEFT JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id
|
|
|
WHERE l.article_id = ? AND l.chart_permission_id =?`
|
|
|
_, err = o.Raw(sql, articleId, chartPermissionId).QueryRows(&items)
|
|
|
return
|