|
@@ -159,6 +159,11 @@ func (this *BusinessChartController) ChartEdbDataList() {
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
|
|
|
+ businessCode := this.GetString("BusinessCode")
|
|
|
+ if businessCode == "" {
|
|
|
+ br.Msg = "商家编码不允许为空"
|
|
|
+ return
|
|
|
+ }
|
|
|
edbInfoCode := this.GetString("EdbCode")
|
|
|
if edbInfoCode == "" {
|
|
|
br.Msg = "参数有误"
|
|
@@ -175,8 +180,15 @@ func (this *BusinessChartController) ChartEdbDataList() {
|
|
|
br.ErrMsg = "ChartEdbDataList GetItemByEdbCode err: " + e.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- if edbInfo.EdbType == 1 { //禁止查询基础指标的数据
|
|
|
+ // 判断这个指标ID是否是用于画图的指标ID
|
|
|
+ chartOb := new(data_manage.EtaBusinessChartPermission)
|
|
|
+ chartCount, err := chartOb.GetChartCountByBusinessCodeAndEdbInfoId(businessCode, edbInfo.EdbInfoId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "ChartEdbDataList GetChartInfoByEdbInfoId err: " + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if chartCount == 0 { //禁止图表之外的指标数据
|
|
|
br.Data = make([]*data_manage.EdbDataList, 0)
|
|
|
br.Ret = 200
|
|
|
br.Msg = "获取成功"
|
|
@@ -216,6 +228,11 @@ func (this *BusinessChartController) TraceEdbInfo() {
|
|
|
br.ErrMsg = "参数错误"
|
|
|
return
|
|
|
}
|
|
|
+ businessCode := this.GetString("BusinessCode")
|
|
|
+ if businessCode == "" {
|
|
|
+ br.Msg = "商家编码不允许为空"
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
resp, err := data.TraceEdbInfoByEdbInfoId(edbInfoId, edbInfoCode)
|
|
|
if err != nil {
|