Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -32,7 +32,7 @@ func (this *BIDaShboardController) MyList() {
 	}()
 
 	// 获取我的看板列表
-	privateCond := ` AND sys_admin_id = ? AND state IN (1,6) `
+	privateCond := ` AND sys_admin_id = ? `
 	privatePars := []interface{}{this.SysUser.AdminId}
 	privateList, err := bi_dashboard.GetBiDashboardList(privateCond, privatePars)
 	if err != nil {
@@ -601,7 +601,7 @@ func (this *BIDaShboardController) PublicList() {
 		br.ErrMsg = "查询失败,Err:" + err.Error()
 		return
 	}
-
+	
 	for _, c := range classifyList {
 		tmpItem := &bi_dashboard.RespPublicGroupListItem{
 			GroupId:   int64(c.BiDashboardClassifyId),
@@ -628,16 +628,17 @@ func (this *BIDaShboardController) PublicList() {
 					AdminId:   systemAdmin.AdminId,
 					DashboardList: make([]*bi_dashboard.BiDashboard, 0),
 				}
+				tmpItem.AdminList = append(tmpItem.AdminList, tmpRespGroupListItem)
 
 				for _, vv := range respGroupNameListItemList {
 					if vv.BiDashboardClassifyId == c.BiDashboardClassifyId {
 						tmpRespGroupListItem.DashboardList = append(tmpRespGroupListItem.DashboardList, vv)
 						tmpItem.Children = append(tmpItem.Children, tmpRespGroupListItem)
+						resp = append(resp, tmpItem)
 					}
 				}
 			}
 		}
-		resp = append(resp, tmpItem)
 	}
 
 	br.Ret = 200

controllers/data_manage/excel/excel_info.go

@@ -1676,6 +1676,7 @@ func (c *ExcelInfoController) GetExcelTableData() {
 		ExcelSource:   excelSource,
 		ExcelSourceEn: excelSourceEn,
 		ExcelInfoId:   excelInfo.ExcelInfoId,
+		Source:        excelInfo.Source,
 	}
 	br.Ret = 200
 	br.Success = true

models/bi_dashboard/bi_dashboard_classify.go

@@ -117,4 +117,5 @@ type RespPublicGroupListItem struct {
 	AdminId       int    `description:"目录创建者账号ID"`
 	DashboardList []*BiDashboard
 	Children      []*RespPublicGroupListItem
+	AdminList  []*RespPublicGroupListItem
 }

models/data_manage/excel/response/excel_info.go

@@ -32,6 +32,7 @@ type ExcelTableDetailResp struct {
 	ExcelSource   string `description:"表格来源str"`
 	ExcelSourceEn string `description:"表格来源（英文）"`
 	ExcelInfoId   int    `description:"表id"`
+	Source        int    `description:"表格来源"`
 }
 
 // ExcelTableDetailConfigResp