fix

controllers/data_manage/chart_info.go

@@ -18,6 +18,7 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
 	"os/exec"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -957,7 +958,6 @@ 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 {
@@ -994,13 +994,6 @@ 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 {
@@ -1014,7 +1007,6 @@ 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)
@@ -1190,6 +1182,26 @@ func (this *ChartInfoController) ChartInfoDetail() {
 		IsSetName: chartInfo.IsSetName,
 	}
 
+	// 图表当前分类的分类树
+	classifyLevels := make([]string, 0)
+	{
+		list, e := data_manage.GetChartClassifyAllBySource(utils.CHART_SOURCE_DEFAULT)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取图表分类失败, Err: %v", e)
+			return
+		}
+		parents := data.GetChartClassifyParentRecursive(list, chartInfo.ChartClassifyId)
+		sort.Slice(parents, func(i, j int) bool {
+			return parents[i].Level < parents[i].Level
+		})
+		for _, v := range parents {
+			classifyLevels = append(classifyLevels, v.UniqueCode)
+		}
+	}
+
+	resp.ClassifyLevels = classifyLevels
+
 	resp.ChartInfo = chartInfo
 	resp.BarChartInfo = barConfig
 	br.Ret = 200
@@ -1514,7 +1526,6 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 	}
 
 	resp := new(data_manage.ChartInfoDetailResp)
-	chartClassifyList := make([]*data_manage.ChartClassifyItems, 0)
 	// 图表数据权限
 	{
 		// 图表分类
@@ -1525,14 +1536,6 @@ 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 {

models/data_manage/chart_info.go

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