Merge remote-tracking branch 'origin/dm' into dm

models/bi_dashboard/bi_dashboard.go

@@ -131,7 +131,7 @@ func GetDashboradByIds(dashboradIds []int) (list []*BiDashboard, err error) {
 func GetAllGrantList(sysUserId int) (list []*BiDashboard, err error) {
 	sql := `SELECT a.* FROM bi_dashboard a JOIN bi_dashboard_grant b on a.bi_dashboard_id=b.bi_dashboard_id 
  WHERE b.grant_admin_id=?`
-	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId, sysUserId).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId).Find(&list).Error
 	return
 }