不显示无权限指标

controllers/data_manage/edb_info.go

@@ -5548,9 +5548,8 @@ func (this *EdbInfoController) EdbChartList() {
 		br.ErrMsg = "获取普通指标列表失败, Err:" + e.Error()
 		return
 	}
-	if len(list) == 0 {
-		list = make([]*data_manage.EdbInfoList, 0)
-	} else {
+	respList := make([]*data_manage.EdbInfoList, 0)
+	if len(list) > 0 {
 		classifyIdList := make([]int, 0)
 		for _, v := range list {
 			v.ConvertToResp()
@@ -5609,6 +5608,11 @@ func (this *EdbInfoController) EdbChartList() {
 				if currClassify, ok := classifyMap[v.ClassifyId]; ok {
 					v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.EdbInfoId, v.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
 
+					// 不展示无权限的
+					if !v.HaveOperaAuth {
+						continue
+					}
+
 					v.Button = data.GetEdbOpButton(sysUser, v.SysUserId, v.EdbType, v.EdbInfoType, v.HaveOperaAuth)
 				}
 
@@ -5618,6 +5622,8 @@ func (this *EdbInfoController) EdbChartList() {
 						v.IsSupplierStop = 1
 					}
 				}
+
+				respList = append(respList, v)
 			}
 		}
 
@@ -5626,7 +5632,7 @@ func (this *EdbInfoController) EdbChartList() {
 
 	resp := response.EdbInfoChartListResp{
 		Paging: page,
-		List:   list,
+		List:   respList,
 	}
 	br.Ret = 200
 	br.Success = true

controllers/data_manage/predict_edb_info.go

@@ -127,9 +127,8 @@ func (this *PredictEdbInfoController) EdbChartList() {
 		return
 	}
 
-	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
-		list = make([]*data_manage.EdbInfoList, 0)
-	} else {
+	respList := make([]*data_manage.EdbInfoList, 0)
+	if len(list) > 0 {
 		classifyIdList := make([]int, 0)
 		for _, v := range list {
 			v.ConvertToResp()
@@ -164,7 +163,15 @@ func (this *PredictEdbInfoController) EdbChartList() {
 			for _, v := range list {
 				if currClassify, ok := classifyMap[v.ClassifyId]; ok {
 					v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.EdbInfoId, v.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
+
+					// 不展示无权限的
+					if !v.HaveOperaAuth {
+						continue
+					}
+
 					v.Button = data.GetEdbOpButton(sysUser, v.SysUserId, v.EdbType, v.EdbInfoType, v.HaveOperaAuth)
+
+					respList = append(respList, v)
 				}
 			}
 		}
@@ -174,7 +181,7 @@ func (this *PredictEdbInfoController) EdbChartList() {
 
 	resp := response.PredictEdbInfoListResp{
 		Paging: page,
-		List:   list,
+		List:   respList,
 	}
 	br.Ret = 200
 	br.Success = true