|
|
@@ -11,6 +11,7 @@ import (
|
|
|
"hongze/hongze_yb/models/tables/chart_info_log"
|
|
|
edbDataModel "hongze/hongze_yb/models/tables/edb_data"
|
|
|
edbInfoModel "hongze/hongze_yb/models/tables/edb_info"
|
|
|
+ "hongze/hongze_yb/models/tables/my_chart"
|
|
|
"hongze/hongze_yb/services/chart"
|
|
|
edbDataService "hongze/hongze_yb/services/edb_data"
|
|
|
"hongze/hongze_yb/services/user"
|
|
|
@@ -304,19 +305,19 @@ func GetChartInfoDetail(c *gin.Context) {
|
|
|
edbList = append(edbList, item)
|
|
|
}
|
|
|
|
|
|
- /*if chartInfoId > 0 && chartInfo != nil {
|
|
|
+ if chartInfoId > 0 && chartInfo != nil {
|
|
|
// 判断是否加入我的图库
|
|
|
{
|
|
|
var myChartCondition string
|
|
|
var myChartPars []interface{}
|
|
|
- myChartCondition += ` AND a.admin_id = ? `
|
|
|
- myChartPars = append(myChartPars, userInfo.AdminId)
|
|
|
+ //myChartCondition += ` AND a.admin_id = ? `
|
|
|
+ //myChartPars = append(myChartPars, userInfo.AdminId)
|
|
|
myChartCondition += ` AND a.chart_info_id = ? `
|
|
|
myChartPars = append(myChartPars, chartInfo.ChartInfoId)
|
|
|
|
|
|
myChartList, err := my_chart.GetMyChartByCondition(myChartCondition, myChartPars)
|
|
|
if err != nil && err != utils.ErrNoRow {
|
|
|
- response.Fail("获取我的图表信息失败, Err:" + err.Error(), c)
|
|
|
+ response.FailMsg("获取失败", "获取我的图表信息失败, Err:" + err.Error(), c)
|
|
|
return
|
|
|
}
|
|
|
if myChartList != nil && len(myChartList) > 0 {
|
|
|
@@ -325,7 +326,7 @@ func GetChartInfoDetail(c *gin.Context) {
|
|
|
chartInfo.MyChartClassifyId = myChartList[0].MyChartClassifyId
|
|
|
}
|
|
|
}
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
resp := new(chart_info.ChartInfoDetailResp)
|
|
|
resp.ChartInfo = chartInfo
|
