Browse Source

fix:详情

Roc 1 year ago
parent
commit
86334b5c5f
1 changed files with 47 additions and 10 deletions
  1. 47 10
      controllers/data_manage/chart_info.go

+ 47 - 10
controllers/data_manage/chart_info.go

@@ -1372,6 +1372,8 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 		resp.XEdbIdValue = xEdbIdValue
 		resp.YDataList = yDataList
 		resp.DataResp = dataResp
+	} else {
+		resp.EdbInfoList = mappingList
 	}
 
 	//图表操作权限
@@ -2209,8 +2211,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 					resp.ChartInfo.MyChartClassifyId = myList[0].MyChartClassifyId
 				}
 
-				resp.ChartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
-
 				//判断是否加入我的图库
 				{
 					var myChartCondition string
@@ -2233,14 +2233,28 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 					}
 				}
 
-				//图表操作权限
-				chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, resp.ChartInfo.HaveOperaAuth)
-				chartInfo.Button = data_manage.ChartViewButton{
-					IsEdit:    chartInfo.IsEdit,
-					IsEnChart: chartInfo.IsEnChart,
-					IsAdd:     chartInfo.IsAdd,
-					IsCopy:    true,
-					IsSetName: chartInfo.IsSetName,
+				// 权限校验
+				{
+					resp.ChartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
+
+					//图表操作权限
+					chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, resp.ChartInfo.HaveOperaAuth)
+					chartInfo.Button = data_manage.ChartViewButton{
+						IsEdit:    chartInfo.IsEdit,
+						IsEnChart: chartInfo.IsEnChart,
+						IsAdd:     chartInfo.IsAdd,
+						IsCopy:    true,
+						IsSetName: chartInfo.IsSetName,
+					}
+
+					if !resp.ChartInfo.HaveOperaAuth {
+						for _, v := range resp.EdbInfoList {
+							v.DataList = nil
+						}
+						resp.DataResp = nil
+						resp.XEdbIdValue = []int{}
+						resp.YDataList = []data_manage.YData{}
+					}
 				}
 
 				isOk = true
@@ -2378,6 +2392,29 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	}
 	isOk = true
 
+	// 权限校验
+	{
+		resp.ChartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
+
+		//图表操作权限
+		chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, resp.ChartInfo.HaveOperaAuth)
+		chartInfo.Button = data_manage.ChartViewButton{
+			IsEdit:    chartInfo.IsEdit,
+			IsEnChart: chartInfo.IsEnChart,
+			IsAdd:     chartInfo.IsAdd,
+			IsCopy:    true,
+			IsSetName: chartInfo.IsSetName,
+		}
+		if !resp.ChartInfo.HaveOperaAuth {
+			for _, v := range resp.EdbInfoList {
+				v.DataList = nil
+			}
+			resp.DataResp = nil
+			resp.XEdbIdValue = []int{}
+			resp.YDataList = []data_manage.YData{}
+		}
+	}
+
 	return
 }