Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -1062,6 +1062,8 @@ func (this *BIDaShboardController) GrantInfo() {
 	if len(grantInfoList) <= 0 {
 		br.Msg = "未配置"
 		br.IsSendEmail = false
+		br.Success = true
+		br.Ret = 200
 		return
 	}
 
@@ -1186,6 +1188,10 @@ func (this *BIDaShboardController) HomePage() {
 		}
 	}
 
+	if item.BiDashboardId == 0 {
+		item = nil
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"

models/bi_dashboard/bi_dashboard_home_page.go

@@ -21,7 +21,9 @@ func (m *BiDashboardHomePage) TableName() string {
 
 // get
 func GetBiDashboardHomePageById(id int) (item *BiDashboardHomePage, err error) {
-	err = global.DEFAULT_DmSQL.Where("admin_id = ?", id).First(&item).Error
+	sql := ` SELECT a.* FROM bi_dashboard_home_page AS a INNER JOIN bi_dashboard AS b 
+ON a.bi_dashboard_id = b.bi_dashboard_id WHERE a.admin_id = ? `
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(&item).Error
 	return
 }