指标详情返回分类数组

controllers/data_manage/edb_classify.go

@@ -493,7 +493,7 @@ func (this *EdbClassifyController) EdbClassifyMove() {
 		return
 	}
 
-	err, errMsg := data.MoveEdbClassify(req.ClassifyId, req.ParentClassifyId, req.PrevClassifyId, req.NextClassifyId, sysUser)
+	err, errMsg := data.MoveEdbClassify(req, sysUser, 0)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

controllers/data_manage/predict_edb_classify.go

@@ -393,7 +393,7 @@ func (this *PredictEdbClassifyController) Move() {
 		return
 	}
 
-	err, errMsg := data.MoveEdbClassify(req.ClassifyId, req.ParentClassifyId, req.PrevClassifyId, req.NextClassifyId, sysUser)
+	err, errMsg := data.MoveEdbClassify(req, sysUser, 1)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg

models/data_manage/edb_classify.go

@@ -118,10 +118,10 @@ func GetEdbClassifyByParentId(parentId int, classifyType int8) (items []*EdbClas
 	return
 }
 
-func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8, level int) (items []*EdbClassifyItems, err error) {
+func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8) (items []*EdbClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? AND level <=?  order by sort asc, level desc, classify_id asc`
-	_, err = o.Raw(sql, rootId, classifyType, level).QueryRows(&items)
+	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? order by level desc, sort asc, classify_id asc`
+	_, err = o.Raw(sql, rootId, classifyType).QueryRows(&items)
 	return
 }
 

services/data/edb_classify.go

@@ -84,7 +84,7 @@ func GetFullClassifyByClassifyId(targetClassifyId int) (targetList []*data_manag
 		targetList = append(targetList, targetItem)
 		return
 	}
-	tmpList, err := data_manage.GetEdbClassifyByRootIdLevel(targetClassify.RootId, targetClassify.ClassifyType, targetClassify.Level)
+	tmpList, err := data_manage.GetEdbClassifyByRootIdLevel(targetClassify.RootId, targetClassify.ClassifyType)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		errMsg = "获取失败"
 		err = errors.New("获取数据失败，Err:" + err.Error())