Merge remote-tracking branch 'origin/eta/1.7.6' into debug

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
 }
 

controllers/data_manage/predict_edb_info.go

@@ -1508,36 +1508,40 @@ func (this *PredictEdbInfoController) DataList() {
 	button := data.GetPredictEdbOpButton(this.SysUser, edbInfo.SysUserId, fullEdb.HaveOperaAuth)
 	button.AddButton = false
 
-	dataList, _, _, err, _ := data.GetPredictDataListByPredictEdbInfo(edbInfo, startDate, endDate, isTimeBetween)
-	//lenDataList := len(dataList)
-	//if lenDataList > 0 {
-	//	tmpValue := dataList[lenDataList-1]
-	//
-	//	// 如果最大值 小于 预测值，那么将预测值作为最大值数据返回
-	//	if edbInfo.MaxValue < tmpValue.Value {
-	//		edbInfo.MaxValue = tmpValue.Value
-	//	}
-	//
-	//	// 如果最小值 大于 预测值，那么将预测值作为最小值数据返回
-	//	if edbInfo.MinValue > tmpValue.Value {
-	//		edbInfo.MinValue = tmpValue.Value
-	//	}
-	//}
-
-	// 季节性图、公历、农历处理
-	resultDataList, err := data.GetChartDataList(dataList, chartType, calendar, edbInfo.LatestDate, startDate)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,Err:" + err.Error()
-		return
-	}
-
 	resp := response.PredictEdbInfoDataResp{
 		EdbInfo:      fullEdb,
-		DataList:     resultDataList,
 		Button:       button,
 		ClassifyList: classifyList,
 	}
+
+	if fullEdb.HaveOperaAuth {
+		dataList, _, _, err, _ := data.GetPredictDataListByPredictEdbInfo(edbInfo, startDate, endDate, isTimeBetween)
+		//lenDataList := len(dataList)
+		//if lenDataList > 0 {
+		//	tmpValue := dataList[lenDataList-1]
+		//
+		//	// 如果最大值 小于 预测值，那么将预测值作为最大值数据返回
+		//	if edbInfo.MaxValue < tmpValue.Value {
+		//		edbInfo.MaxValue = tmpValue.Value
+		//	}
+		//
+		//	// 如果最小值 大于 预测值，那么将预测值作为最小值数据返回
+		//	if edbInfo.MinValue > tmpValue.Value {
+		//		edbInfo.MinValue = tmpValue.Value
+		//	}
+		//}
+
+		// 季节性图、公历、农历处理
+		resultDataList, err := data.GetChartDataList(dataList, chartType, calendar, edbInfo.LatestDate, startDate)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败,Err:" + err.Error()
+			return
+		}
+
+		resp.DataList = resultDataList
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"