fix myShareList

controllers/bi_dashboard.go

@@ -441,9 +441,7 @@ func (this *BIDaShboardController) ShareList() {
 	grantList := bi_dashboard.RespGroupList{}
 
 	// 获取我的看板列表
-	ShareCond := ` AND sys_admin_id = ? AND state IN (1,6) `
-	SharePars := []interface{}{this.SysUser.AdminId}
-	ShareList, err := bi_dashboard.GetBiDashboardList(ShareCond, SharePars)
+	ShareList, err := bi_dashboard.GetAllMyShareList(this.SysUser.AdminId)
 	if err != nil {
 		err = errors.New("我的看板列表查询出错:" + err.Error())
 		br.ErrMsg = err.Error()

models/bi_dashboard/bi_dashboard.go

@@ -145,3 +145,12 @@ type BiDashboardEditingReq struct {
 	BiDashboardId  int `description:"看板主键ID"`
 	Status int `description:"标记状态: 1-编辑中; 2-编辑完成"`
 }
+
+// GetAllMyShareList 获取我共享的看板
+func GetAllMyShareList(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 a."sys_admin_id" = ? GROUP BY a."bi_dashboard_id" ,"bi_dashboard_classify_id" ,"bi_dashboard_name" ,"sys_admin_id" ,
+"sys_admin_name" ,"sort" ,a."create_time" ,a."modify_time" ,"state"   `
+	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId).Find(&list).Error
+	return
+}

models/bi_dashboard/bi_dashboard_grant.go

@@ -25,7 +25,7 @@ type GrantDashboardReq struct {
 }
 
 // MultiAddDashboardGrant 批量添加授权记录
-func MultiAddDashboardGrant(pptId int, list []*BiDashboardGrant) (err error) {
+func MultiAddDashboardGrant(boardId int, list []*BiDashboardGrant) (err error) {
 
 	to := global.DEFAULT_DmSQL.Begin()
 	defer func() {
@@ -37,8 +37,7 @@ func MultiAddDashboardGrant(pptId int, list []*BiDashboardGrant) (err error) {
 	}()
 
 	sql := "DELETE from bi_dashboard_grant where bi_dashboard_id=?"
-	//_, err = to.Raw(sql, pptId).Exec()
-	err = to.Exec(sql, pptId).Error
+	err = to.Exec(sql, boardId).Error
 	if err != nil {
 		return
 	}