Merge branch 'debug' of http://8.136.199.33:3000/eta_server/eta_api into debug

controllers/data_manage/chart_info.go

@@ -959,7 +959,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	var err error
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo.HaveOperaAuth = true
-
+	chartClassifyList := make([]*data_manage.ChartClassifyItems, 0)
 	if chartInfoId > 0 {
 		chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 		if err != nil {
@@ -996,6 +996,13 @@ func (this *ChartInfoController) ChartInfoDetail() {
 				return
 			}
 
+			chartClassifyList, err = data_manage.GetChartClassifiesById(chartClassify.RootId)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取图表信息失败"
+				br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
+				return
+			}
+
 			// 已授权分类id
 			permissionChartIdList, permissionClassifyIdList, err := data_manage_permission.GetUserChartAndClassifyPermissionList(this.SysUser.AdminId, chartInfo.ChartInfoId, chartInfo.ChartClassifyId)
 			if err != nil {
@@ -1009,6 +1016,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 
 	resp := new(data_manage.ChartInfoDetailResp)
 
+	resp.ChartClassifyList = chartClassifyList
 	mappingList := make([]*data_manage.ChartEdbInfoMapping, 0)
 	if chartInfoId > 0 {
 		mappingList, err = data_manage.GetChartEdbMappingList(chartInfoId)
@@ -1508,7 +1516,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 	}
 
 	resp := new(data_manage.ChartInfoDetailResp)
-
+	chartClassifyList := make([]*data_manage.ChartClassifyItems, 0)
 	// 图表数据权限
 	{
 		// 图表分类
@@ -1519,6 +1527,14 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 			return
 		}
 
+		chartClassifyList, err = data_manage.GetChartClassifiesById(chartClassify.RootId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取图表信息失败"
+			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
+			return
+		}
+		resp.ChartClassifyList = chartClassifyList
+
 		// 已授权分类id
 		permissionChartIdList, permissionClassifyIdList, err := data_manage_permission.GetUserChartAndClassifyPermissionList(this.SysUser.AdminId, chartInfo.ChartInfoId, chartInfo.ChartClassifyId)
 		if err != nil {
@@ -4576,7 +4592,7 @@ func (this *ChartInfoController) ChartList() {
 	condition += ` AND source = ? `
 	pars = append(pars, utils.CHART_SOURCE_DEFAULT)
 
-	if len(chartClassifyIds) > 0 {
+	if len(chartClassifyIdsStr) > 0 {
 		if !subClassify {
 			chartClassifyId, err := data_manage.GetChartClassifyByIdsNoSubClassify(chartClassifyIds)
 			if err != nil && err.Error() != utils.ErrNoRow() {

models/data_manage/chart_classify.go

@@ -552,4 +552,20 @@ ORDER BY
 	chart_classify_id ASC`
 	_, err = o.Raw(sql, parentId, parentId, adminId).QueryRows(&items)
 	return
+}
+
+func GetChartClassifiesById(chartClassifyId int) (items []*ChartClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `
+    SELECT *
+    FROM chart_classify
+    WHERE chart_classify_id = ? 
+    OR parent_id = ?
+    OR parent_id IN (
+        SELECT chart_classify_id
+        FROM chart_classify
+        WHERE parent_id = ?
+    );`
+	_,err = o.Raw(sql, chartClassifyId, chartClassifyId, chartClassifyId).QueryRows(&items)
+	return
 }

models/data_manage/chart_info.go

@@ -774,6 +774,7 @@ type ChartInfoDetailResp struct {
 	CorrelationChartInfo *CorrelationInfo `description:"相关性图表信息"`
 	DataResp             interface{}      `description:"图表数据,根据图的类型而定的,没有确定的数据格式"`
 	ClassifyLevels       []string         `description:"图表分类的UniqueCode-从最顶级到当前分类(给前端回显定位用的=_=!)"`
+	ChartClassifyList    []*ChartClassifyItems `description:"图表分类列表 给前端回显定位用"`
 }
 
 type FutureGoodChartInfoDetailResp struct {