fix

controllers/data_manage/edb_classify.go

@@ -796,7 +796,7 @@ func (this *EdbClassifyController) ItemsV3() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	rootTwoList, err := data_manage.GetEdbClassifyByParentIdTwo(0, 0)
+	rootTwoList, err := data_manage.GetEdbClassifyByParentIdTwo( 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -821,23 +821,12 @@ func (this *EdbClassifyController) ItemsV3() {
 		button := data.GetEdbClassifyOpButton(this.SysUser, v.SysUserId)
 		button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
 		v.Button = button
-
-		rootTwoChildMap[v.ParentIdTwo] = append(rootTwoChildMap[v.ParentIdTwo], v)
+		if v.Level == 3 {
+			rootTwoChildMap[v.ParentId] = append(rootTwoChildMap[v.ParentId], v)
+		}
 	}
 
 	nodeAll := make([]*data_manage.EdbClassifyItems, 0)
-	//for _, v := range rootTwoList {
-	//	button := data.GetEdbClassifyOpButton(this.SysUser, v.SysUserId)
-	//	v.Button = button
-	//
-	//	if existItems, ok := rootTwoChildMap[v.ClassifyId]; ok {
-	//		v.Children = existItems
-	//	} else {
-	//		items := make([]*data_manage.EdbClassifyItems, 0)
-	//		v.Children = items
-	//	}
-	//	nodeAll = append(nodeAll, v)
-	//}
 	for _, v := range rootList {
 		button := data.GetEdbClassifyOpButton(this.SysUser, v.SysUserId)
 		v.Button = button
@@ -914,7 +903,7 @@ func (this *EdbClassifyController) AddEdbClassifyV2() {
 	}
 
 	//添加指标
-	_, err, errMsg := data.AddEdbClassifyV2(req.ClassifyName, req.ParentId, req.ParentIdTwo, req.Level, 0, this.SysUser.AdminId, this.SysUser.AdminName)
+	_, err, errMsg := data.AddEdbClassifyV2(req.ClassifyName, req.ParentId, req.Level, 0, this.SysUser.AdminId, this.SysUser.AdminName)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

models/data_manage/edb_classify.go

@@ -11,7 +11,6 @@ type EdbClassify struct {
 	ClassifyType    uint8     `description:"分类类型，0：普通指标分类，1：预测指标分类"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
-	ParentIdTwo     int       `description:"三级id"`
 	HasData         int       `description:"是否含有指标数据"`
 	CreateTime      time.Time `description:"创建时间"`
 	ModifyTime      time.Time `description:"修改时间"`
@@ -138,7 +137,6 @@ type EdbClassifyItems struct {
 	ClassifyName    string
 	ClassifyNameEn  string
 	ParentId        int
-	ParentIdTwo     int
 	Level           int    `description:"层级"`
 	Sort            int    `description:"排序字段，越小越靠前，默认值：10"`
 	UniqueCode      string `description:"唯一编码"`
@@ -272,30 +270,29 @@ type ClassifyEdbInfoListResp struct {
 // GetEdbClassifyAllV2 获取普通指标的分类列表
 func GetEdbClassifyAllV2() (items []*EdbClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM edb_classify WHERE parent_id_two <>0  AND classify_type = 0  order by sort asc,classify_id asc`
+	sql := ` SELECT * FROM edb_classify WHERE parent_id <>0  AND classify_type = 0  order by sort asc,classify_id asc`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-func GetEdbClassifyByParentIdTwo(parentIdTwo int, classifyType int8) (items []*EdbClassifyItems, err error) {
+func GetEdbClassifyByParentIdTwo(classifyType int8) (items []*EdbClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM edb_classify WHERE parent_id_two=? AND classify_type = ?  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentIdTwo, classifyType).QueryRows(&items)
+	sql := ` SELECT * FROM edb_classify WHERE level=2 AND classify_type = ?  order by sort asc,classify_id asc`
+	_, err = o.Raw(sql, classifyType).QueryRows(&items)
 	return
 }
 
 type AddEdbClassifyReqV2 struct {
 	ClassifyName string `description:"分类名称"`
 	ParentId     int    `description:"父级id,第一级传0"`
-	ParentIdTwo  int    `description:"二级id,第一级传0"`
 	Level        int    `description:"层级,第一级传0，其余传上一级的层级"`
 	ClassifyType uint8  `description:"分类类型，0：普通指标分类，1：预测指标分类"`
 }
 
 // GetEdbClassifyMaxSortV2 获取分类下最大的排序数
-func GetEdbClassifyMaxSortV2(parentId,parentIdTwo int, classifyType uint8) (sort int, err error) {
+func GetEdbClassifyMaxSortV2(parentId int, classifyType uint8) (sort int, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM edb_classify WHERE parent_id=? AND parent_id_two=? AND classify_type=? `
-	err = o.Raw(sql, parentId,parentIdTwo, classifyType).QueryRow(&sort)
+	err = o.Raw(sql, parentId, classifyType).QueryRow(&sort)
 	return
 }

services/data/edb_classify.go

@@ -553,7 +553,7 @@ func GetPredictEdbClassifyOpButton(sysUser *system.Admin, belongUserId int) (but
 }
 
 // AddEdbClassifyV2 添加指标分类
-func AddEdbClassifyV2(classifyName string, parentId, parentIdTwo, level int, classifyType uint8, sysUserId int, sysUserName string) (classifyInfo *data_manage.EdbClassify, err error, errMsg string) {
+func AddEdbClassifyV2(classifyName string, parentId, level int, classifyType uint8, sysUserId int, sysUserName string) (classifyInfo *data_manage.EdbClassify, err error, errMsg string) {
 	count, err := data_manage.GetEdbClassifyCount(classifyName, parentId, classifyType)
 	if err != nil {
 		errMsg = `判断名称是否已存在失败`
@@ -564,7 +564,7 @@ func AddEdbClassifyV2(classifyName string, parentId, parentIdTwo, level int, cla
 		return
 	}
 	//获取该层级下最大的排序数
-	maxSort, err := data_manage.GetEdbClassifyMaxSortV2(parentId, parentIdTwo, classifyType)
+	maxSort, err := data_manage.GetEdbClassifyMaxSortV2(parentId, classifyType)
 
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	classifyInfo = &data_manage.EdbClassify{
@@ -572,7 +572,6 @@ func AddEdbClassifyV2(classifyName string, parentId, parentIdTwo, level int, cla
 		ClassifyType:    classifyType,
 		ClassifyName:    classifyName,
 		ParentId:        parentId,
-		ParentIdTwo:     parentIdTwo,
 		HasData:         0,
 		CreateTime:      time.Now(),
 		ModifyTime:      time.Now(),