Merge branch 'feature/eta_1.9.8' into debug

controllers/data_manage/excel/custom_analysis.go

@@ -720,6 +720,7 @@ func (c *CustomAnalysisController) ClassifyList() {
 				shareExists[int(v.ExcelInfoId)] = true
 				item.Level = 2
 				item.ParentId = shareExcel.ExcelClassifyId
+				item.ShowShareBtn = true
 				shareExcel.Children = append(shareExcel.Children, item)
 				continue
 			}
@@ -740,12 +741,12 @@ func (c *CustomAnalysisController) ClassifyList() {
 					us.Level = 2
 					us.UniqueCode = fmt.Sprintf("%d-%d", sharedExcel.ExcelClassifyId, v.CreateUserId)
 					us.HaveOperaAuth = true
+					us.ShowShareBtn = false
 					us.Children = make([]*excelModel.ExcelClassifyItems, 0)
 					sharedUserClassify[v.CreateUserId] = us
 				}
 				item.Level = 3
 				item.ParentId = sharedUserClassify[v.CreateUserId].ExcelClassifyId
-				item.PermissionType = v.PermissionType
 				sharedUserClassify[v.CreateUserId].Children = append(sharedUserClassify[v.CreateUserId].Children, item)
 			}
 		}
@@ -786,6 +787,7 @@ func (c *CustomAnalysisController) ClassifyList() {
 	excelInfoMap := make(map[int][]*excelModel.ExcelClassifyItems)
 	for _, v := range allExcelInfo {
 		v.HaveOperaAuth = true
+		v.ShowShareBtn = true
 		v.HasShare = hasShareMap[v.ExcelInfoId]
 		excelInfoMap[v.ExcelClassifyId] = append(excelInfoMap[v.ExcelClassifyId], v)
 	}

models/data_manage/excel/excel_classify.go

@@ -137,8 +137,8 @@ type ExcelClassifyItems struct {
 	Children          []*ExcelClassifyItems
 	IsJoinPermission  int  `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
 	HaveOperaAuth     bool `description:"是否有数据权限"`
-	PermissionType    int  `description:"权限类型: 权限类型: 0-全部; 1-查看; 2-编辑"`
 	HasShare          bool `description:"是否已共享: true-是; false-否"`
+	ShowShareBtn      bool `description:"是否显示共享按钮: true-是; false-否"`
 }
 
 func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *ExcelClassify, err error) {