fix bug

controllers/data_manage/chart_classify.go

@@ -791,7 +791,7 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 	}
 
 	// 校验移动的父级目录下是否有重名分类
-	exists, e := data_manage.GetChartClassifyByParentIdAndName(req.ParentClassifyId, chartClassifyInfo.ChartClassifyName, req.ClassifyId)
+	exists, e := data_manage.GetChartClassifyByParentIdAndName(utils.CHART_SOURCE_DEFAULT, req.ParentClassifyId, chartClassifyInfo.ChartClassifyName, req.ClassifyId)
 	if e != nil && !utils.IsErrNoRow(e) {
 		br.Msg = "移动失败"
 		br.ErrMsg = "获取父级目录下的同名分类失败, Err: " + e.Error()

models/data_manage/chart_classify.go

@@ -346,10 +346,10 @@ func GetCrossVarietyChartClassifyBySysUserId(sysUserId int) (item *ChartClassify
 }
 
 // GetChartClassifyByParentIdAndName 根据父级ID和名称获取分类
-func GetChartClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *ChartClassify, err error) {
+func GetChartClassifyByParentIdAndName(source, parentId int, classifyName string, classifyId int) (item *ChartClassify, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT * FROM chart_classify WHERE parent_id = ? AND chart_classify_name = ? AND chart_classify_id <> ? LIMIT 1`
-	err = o.Raw(sql, parentId, classifyName, classifyId).First(&item).Error
+	sql := `SELECT * FROM chart_classify WHERE source = ? AND parent_id = ? AND chart_classify_name = ? AND chart_classify_id <> ? LIMIT 1`
+	err = o.Raw(sql, source, parentId, classifyName, classifyId).First(&item).Error
 
 	return
 }

services/data/chart_classify.go

@@ -469,7 +469,7 @@ func MoveChartClassify(req data_manage.MoveChartClassifyReq, sysUser *system.Adm
 			return
 		}
 		// 如果是移动目录, 那么校验一下父级目录下是否有重名目录
-		exists, e := data_manage.GetChartClassifyByParentIdAndName(parentClassifyId, chartClassifyInfo.ChartClassifyName, classifyId)
+		exists, e := data_manage.GetChartClassifyByParentIdAndName(utils.CHART_SOURCE_RANGE_ANALYSIS, parentClassifyId, chartClassifyInfo.ChartClassifyName, classifyId)
 		if e != nil && !utils.IsErrNoRow(e) {
 			errMsg = "移动失败"
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())

utils/constants.go

@@ -278,8 +278,8 @@ const (
 
 // 图表类型
 const (
-	CHART_SOURCE_DEFAULT                         = 1
-	CHART_SOURCE_FUTURE_GOOD                     = 2
+	CHART_SOURCE_DEFAULT                         = 1  //图表
+	CHART_SOURCE_FUTURE_GOOD                     = 2  //商品价格曲线
 	CHART_SOURCE_CORRELATION                     = 3  // 相关性图表
 	CHART_SOURCE_ROLLING_CORRELATION             = 4  // 滚动相关性图表
 	CHART_SOURCE_FUTURE_GOOD_PROFIT              = 5  // 商品利润曲线