Merge branch 'BI_Dashboard' of http://8.136.199.33:3000/eta_gn_server/eta_api into BI_Dashboard

models/bi_dashboard/bi_dashboard.go

@@ -120,7 +120,7 @@ func GetDashboradByIds(dashboradIds []int) (list []*BiDashboard, err error) {
 // GetAllGrantList 获取已经有权限的看板列表
 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=? GROUP BY a.bi_dashboard_id`
+ WHERE b.grant_admin_id=?`
 	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId, sysUserId).Find(&list).Error
 	return
 }

models/bi_dashboard/bi_dashboard_grant.go

@@ -6,13 +6,12 @@ import (
 
 type BiDashboardGrant struct {
 	GrantId       int       `gorm:"primaryKey;autoIncrement;column:grant_id"` // 授权id
-	BiDashboardId int       `gorm:"column:bi_dashboard_id" `        // 看板id
-	AdminId       int       `gorm:"column:admin_id"`                   // 授权的用户id
-	CreateTime    time.Time `gorm:"column:create_time"`               // 授权时间
+	BiDashboardId int       `gorm:"column:bi_dashboard_id" `                  // 看板id
+	GrantAdminId  int       `gorm:"column:grant_admin_id"`                    // 授权的用户id
+	CreateTime    time.Time `gorm:"column:create_time"`                       // 授权时间
 }
 
 // tableName
 func (m *BiDashboardGrant) TableName() string {
 	return "bi_dashboard_grant"
 }
-