Merge branch 'hotfix/edb_classify_move' of eta_server/eta_mobile into master

services/data/edb_classify.go

@@ -516,7 +516,7 @@ func MoveEdbClassify(req data_manage.MoveEdbClassifyReq, sysUser *system.Admin,
 	classifyId := req.ClassifyId
 	parentClassifyId := req.ParentClassifyId
 	prevClassifyId := req.PrevClassifyId
-	nextClassifyId := req.PrevClassifyId
+	nextClassifyId := req.NextClassifyId
 
 	edbInfoId := req.EdbInfoId
 	prevEdbInfoId := req.PrevEdbInfoId
@@ -773,7 +773,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 			if firstClassify != nil && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
-				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, edbClassifyInfo.ClassifyType)
+				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, classifyType)
 				//该分类下的所有指标也需要+1
 				_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, 0, updateSortStr)
 			} else {
@@ -904,7 +904,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 			if firstClassify != nil && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
-				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, edbClassifyInfo.ClassifyType)
+				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, classifyType)
 				//该分类下的所有指标也需要+1
 				_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, 0, updateSortStr)
 			} else {