fix

controllers/sandbox/sandbox.go

@@ -1010,6 +1010,8 @@ func (this *SandboxController) AddSandboxClassify() {
 	classify.ModifyTime = time.Now()
 	classify.SysUserId = this.SysUser.AdminId
 	classify.SysUserRealName = this.SysUser.RealName
+	classify.ChartPermissionId = req.ChartPermissionId
+	classify.ChartPermissionName = req.ChartPermissionName
 	classify.Level = req.Level + 1
 	classify.Sort = maxSort + 1
 
@@ -1433,13 +1435,13 @@ func (this *SandboxController) ListV2() {
 	var pars []interface{}
 
 	if sandboxClassifyId > 0 {
-		chartClassifyId, err := sandbox.GetSandboxClassify(sandboxClassifyId)
+		sandboxClassifyId, err := sandbox.GetSandboxClassify(sandboxClassifyId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
 		}
-		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
+		condition += " AND sandbox_classify_id IN(" + sandboxClassifyId + ") "
 		//pars = append(pars, chartClassifyId)
 	}
 	if keyWord != "" {

models/sandbox/sand_box_classify.go

@@ -3,20 +3,22 @@ package sandbox
 import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-"time"
+	"time"
 )
 
 type SandboxClassify struct {
 	SandboxClassifyId   int       `orm:"column(sandbox_classify_id);pk"`
 	SandboxClassifyName string    `description:"分类名称"`
-	ParentId          int       `description:"父级id"`
-	HasData           int       `description:"是否含有指标数据"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
-	SysUserId         int       `description:"创建人id"`
-	SysUserRealName   string    `description:"创建人姓名"`
-	Level             int       `description:"层级"`
-	Sort              int       `description:"排序字段，越小越靠前，默认值：10"`
+	ParentId            int       `description:"父级id"`
+	HasData             int       `description:"是否含有指标数据"`
+	CreateTime          time.Time `description:"创建时间"`
+	ModifyTime          time.Time `description:"修改时间"`
+	SysUserId           int       `description:"创建人id"`
+	SysUserRealName     string    `description:"创建人姓名"`
+	Level               int       `description:"层级"`
+	ChartPermissionId   int       `description:"品种id"`
+	ChartPermissionName string    `description:"品种名称"`
+	Sort                int       `description:"排序字段，越小越靠前，默认值：10"`
 }
 
 func AddSandboxClassify(item *SandboxClassify) (lastId int64, err error) {
@@ -64,6 +66,8 @@ type AddSandboxClassifyReq struct {
 	SandboxClassifyName string `description:"分类名称"`
 	ParentId            int    `description:"父级id,第一级传0"`
 	Level               int    `description:"层级,第一级传0，其余传上一级的层级"`
+	ChartPermissionId   int    `description:"品种id"`
+	ChartPermissionName string `description:"品种名称"`
 }
 
 func GetSandboxClassifyCount(sandboxClassifyName string, parentId int) (count int, err error) {
@@ -127,13 +131,11 @@ type SandboxClassifyDeleteCheckResp struct {
 	TipsMsg      string `description:"提示信息"`
 }
 
-
 type DeleteSandboxClassifyReq struct {
 	SandboxClassifyId int `description:"分类id"`
-	SandboxId     int `description:"指标id"`
+	SandboxId         int `description:"指标id"`
 }
 
-
 func DeleteSandboxClassify(classifyId int) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM sandbox_classify
@@ -184,4 +186,4 @@ func (sandboxClassify *SandboxClassify) Update(cols []string) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(sandboxClassify, cols...)
 	return
-}
+}

models/sandbox/sandbox.go

@@ -192,9 +192,10 @@ type SandboxListItem struct {
 }
 
 // GetList 获取沙盘列表页
+// todo 测试服兼容
 func GetList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*SandboxListItem, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "select a.sandbox_id,a.name,a.chart_permission_id,a.chart_permission_name,a.curr_version,a.code,a.pic_url,a.op_user_id,a.op_user_name,a.modify_time,a.create_time,b.version_code from sandbox as a join sandbox_version b on a.sandbox_id=b.sandbox_id and a.curr_version=b.curr_version where 1=1 AND a.is_delete = 0 "
+	sql := "select a.sandbox_id,a.name,a.chart_permission_id,a.chart_permission_name,a.curr_version,a.code,a.pic_url,a.op_user_id,a.op_user_name,a.modify_time,a.create_time,b.version_code from sandbox_bak_20231018 as a join sandbox_version b on a.sandbox_id=b.sandbox_id and a.curr_version=b.curr_version where 1=1 AND a.is_delete = 0 "
 	sql += condition
 	sql += ` order by a.modify_time desc,a.sandbox_id desc`