fix

controllers/data_manage/chart_classify.go

@@ -263,11 +263,25 @@ func handleNoPermissionChart(allNodes []*data_manage.ChartClassifyItems, noPermi
 
 				if chartList.Children != nil {
 					for _, chartInfo := range chartList.Children {
+						thirdInfo := *chartInfo
+						thirdList := make([]*data_manage.ChartClassifyItems, 0)
 						// 如果指标不可见，那么就不返回该指标
 						if _, ok := noPermissionChartIdMap[chartInfo.ChartInfoId]; ok {
 							continue
 						}
 						tmpList = append(tmpList, chartInfo)
+
+						if chartInfo.Children != nil {
+							for _, thirdChart := range chartInfo.Children {
+								// 如果指标不可见，那么就不返回该指标
+								if _, ok := noPermissionChartIdMap[chartInfo.ChartInfoId]; ok {
+									continue
+								}
+								thirdList = append(thirdList, thirdChart)
+							}
+						}
+						thirdInfo.Children = thirdList
+						tmpList = append(tmpList, &thirdInfo)
 					}
 				}
 				tmpInfo.Children = tmpList
@@ -931,14 +945,14 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 
 	isShowMe, _ := this.GetBool("IsShowMe")
 	if isShowMe {
-		errMsg, err := getChartClassifyListForMeV2(*this.SysUser, resp)
-		if err != nil {
-			br.Msg = errMsg
-			br.ErrMsg = err.Error()
+		allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_DEFAULT}, sysUser.AdminId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取全部数据失败，Err:" + err.Error()
 			return
 		}
 		// 移除没有权限的图表
-		allNodes := handleNoPermissionChart(resp.AllNodes, noPermissionChartIdMap)
+		allNodes := handleNoPermissionChart(allChartInfo, noPermissionChartIdMap)
 		resp.AllNodes = allNodes
 
 		br.Ret = 200

controllers/data_manage/predict_edb_classify.go

@@ -603,7 +603,8 @@ func (this *PredictEdbClassifyController) ListV2() {
 		if existItems, ok := rootTwoMap[v.ClassifyId]; ok {
 			v.Children = existItems
 			for _, item := range existItems {
-				button := data.GetPredictEdbClassifyOpButton(this.SysUser, item.SysUserId)
+				button := data.GetPredictEdbOpButton(this.SysUser, v.SysUserId)
+				button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
 				item.Button = button
 
 				if existItems, ok := rootTwoChildMap[item.ClassifyId]; ok {