fix

controllers/bi_dashboard.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"eta_gn/eta_api/models"
+	biapprove "eta_gn/eta_api/models/bi_approve"
 	"eta_gn/eta_api/models/bi_dashboard"
 	"eta_gn/eta_api/models/system"
 	biapproveSerice "eta_gn/eta_api/services/bi_approve"
-	biapprove "eta_gn/eta_api/models/bi_approve"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strconv"
@@ -572,14 +572,15 @@ func (this *BIDaShboardController) PublicList() {
 		}
 
 		tmp := &bi_dashboard.BiDashboard{
-			BiDashboardId:   v.BiDashboardId,
-			BiDashboardName: v.BiDashboardName,
-			CreateTime:      v.CreateTime,
-			ModifyTime:      v.ModifyTime,
-			Sort:            v.Sort,
-			State:           v.State,
-			SysAdminId:      v.SysAdminId,
-			SysAdminName:    v.SysAdminName,
+			BiDashboardId:         v.BiDashboardId,
+			BiDashboardClassifyId: v.BiDashboardClassifyId,
+			BiDashboardName:       v.BiDashboardName,
+			CreateTime:            v.CreateTime,
+			ModifyTime:            v.ModifyTime,
+			Sort:                  v.Sort,
+			State:                 v.State,
+			SysAdminId:            v.SysAdminId,
+			SysAdminName:          v.SysAdminName,
 		}
 		publicDashboardList = append(publicDashboardList, tmp)
 		publicDashboardListMap[v.SysAdminId] = publicDashboardList
@@ -601,7 +602,7 @@ func (this *BIDaShboardController) PublicList() {
 		br.ErrMsg = "查询失败,Err:" + err.Error()
 		return
 	}
-	
+
 	for _, c := range classifyList {
 		tmpItem := &bi_dashboard.RespPublicGroupListItem{
 			GroupId:   int64(c.BiDashboardClassifyId),
@@ -623,9 +624,9 @@ func (this *BIDaShboardController) PublicList() {
 
 				// ppt 分组信息
 				tmpRespGroupListItem := &bi_dashboard.RespPublicGroupListItem{
-					GroupId:   int64(systemAdmin.AdminId),
-					GroupName: systemAdmin.RealName,
-					AdminId:   systemAdmin.AdminId,
+					GroupId:       int64(systemAdmin.AdminId),
+					GroupName:     systemAdmin.RealName,
+					AdminId:       systemAdmin.AdminId,
 					DashboardList: make([]*bi_dashboard.BiDashboard, 0),
 				}
 				tmpItem.AdminList = append(tmpItem.AdminList, tmpRespGroupListItem)
@@ -1090,7 +1091,6 @@ func (this *BIDaShboardController) PublicCancel() {
 		return
 	}
 
-
 	item, err := bi_dashboard.GetDashboardById(req.BiDashboardId)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常！"
@@ -1098,7 +1098,6 @@ func (this *BIDaShboardController) PublicCancel() {
 		return
 	}
 
-
 	// 校验是否开启了审批流
 	opening, e := biapproveSerice.CheckBiOpenApprove(item.BiDashboardClassifyId)
 	if e != nil {
@@ -1128,7 +1127,6 @@ func (this *BIDaShboardController) PublicCancel() {
 		}
 	}
 
-	
 	item.BiDashboardClassifyId = 0
 	item.State = 1