Merge remote-tracking branch 'origin/dm' into dm

controllers/sandbox/sandbox.go

@@ -1738,15 +1738,24 @@ func (this *SandboxController) ListV2() {
 		return
 	}
 
+	classifyList, err := sandbox.GetAllSandboxClassify()
+	if err != nil && !utils.IsErrNoRow(err) {
+		br.Msg = "获取分类信息失败"
+		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
+		return
+	}
+	classsifyMap := make(map[int]*sandbox.SandboxClassifyItems)
+	for _, v := range classifyList {
+		classsifyMap[v.SandboxClassifyId] = v
+	}
+
 	for i, v := range list {
-		ids, err := sandbox.GetSandboxAllParentByClassifyId(v.SandboxClassifyId)
-		if err != nil {
-			br.Msg = "获取父级信息错误！"
-			br.ErrMsg = "获取父级信息错误，Err:" + err.Error()
-			return
-		}
+		parentIds := make([]int, 0)
+		sandboxService.GetSandBoxParentIds(v.SandboxClassifyId, classsifyMap, parentIds)
+		ids := utils.IntArr2joinString(parentIds,",")
 		list[i].ParentIds = ids
 	}
+
 	resp := new(sandbox.SandboxListResp)
 	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*sandbox.SandboxListItems, 0)

models/ai_summary/ai_summary_classify.go

@@ -41,7 +41,7 @@ type AiSummaryClassifyItems struct {
 	Sort                int                       `gorm:"column:sort;type:int(9) unsigned;default:10"`                // 排序字段，越小越靠前，默认值：10
 	RootId              int                       `gorm:"column:root_id;type:int(11);not null;default:0"`             // 顶级ID
 	HasData             int                       `gorm:"column:has_data;type:tinyint(4);default:0"`                  // 是否存在指标数据:1有，2：无
-	AiSummaryId         int                       `description:"纪要id" gorm:"-"`
+	AiSummaryId         int                       `description:"纪要id" gorm:"ai_summary_id"`
 	UniqueCode          string                    `description:"唯一编码" gorm:"-"`
 	Children            []*AiSummaryClassifyItems `gorm:"-"`
 }

models/sandbox/sandbox_classify.go

@@ -330,3 +330,12 @@ func UpdateSandboxClassifyChartPermissionById(ChartPermissionId int, ChartPermis
 	err = global.DmSQL["data"].Exec(sql, ChartPermissionId, ChartPermissionName).Error
 	return
 }
+
+// GetAllSandboxClassify
+func GetAllSandboxClassify() (items []*SandboxClassifyItems, err error) {
+	//o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM sandbox_classify `
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
+	return
+}

services/sandbox/sandbox.go

@@ -958,3 +958,10 @@ func ReplaceEdbInSandbox(oldEdbInfoId, newEdbInfoId int) (err error) {
 
 	return
 }
+
+func GetSandBoxParentIds(classifyId int, classifymap map[int]*sandbox.SandboxClassifyItems, parentIds []int) {
+	if item, ok := classifymap[classifyId]; ok {
+		parentIds = append(parentIds, item.ParentId)
+		GetSandBoxParentIds(item.ParentId, classifymap, parentIds)
+	}
+}