Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -1117,10 +1117,11 @@ func (this *BIDaShboardController) PublicCancel() {
 	//	item.State = 6
 	//}
 
+	
 	item.BiDashboardClassifyId = 0
 	item.State = 1
 
-	err = bi_dashboard.EditDashboard(item)
+	err = bi_dashboard.SaveDashboard(item)
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()

models/bi_dashboard/bi_dashboard.go

@@ -125,3 +125,7 @@ func GetAllGrantList(sysUserId int) (list []*BiDashboard, err error) {
 	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId, sysUserId).Find(&list).Error
 	return
 }
+
+func SaveDashboard(item *BiDashboard) (err error) {
+	return global.DEFAULT_DmSQL.Save(item).Error
+}