Browse Source

查询图表信息

xyxie 1 week ago
parent
commit
f01bbf8400

+ 3 - 3
models/data_manage/chart_classify.go

@@ -735,9 +735,9 @@ func GetChartClassifiesById(chartClassifyId int) (items []*ChartClassifyItems, e
 	return
 }
 
-func GetChartClassifyByLevelPath(levelPath string) (items []*ChartClassify, err error) {
-	sql := `SELECT * FROM chart_classify where level_path like '` + levelPath + `%'`
-	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&items).Error
+func GetChartClassifyByLevelPath(levelPath string, source int) (items []*ChartClassify, err error) {
+	sql := `SELECT * FROM chart_classify where level_path like '` + levelPath + `%' and source = ?`
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, source).Find(&items).Error
 	return
 }
 

+ 1 - 1
services/data/chart_classify.go

@@ -953,7 +953,7 @@ func UpdateChartClassifyLevelPathWithChildren(chartClassifyInfo *data_manage.Cha
 	}
 
 	// 更新子分类的levelpath
-	tmpList, err := data_manage.GetChartClassifyByLevelPath(oldLevelPath)
+	tmpList, err := data_manage.GetChartClassifyByLevelPath(oldLevelPath, chartClassifyInfo.Source)
 	if err != nil {
 		return fmt.Errorf("保存分类失败,Err:" + err.Error())
 	}

+ 2 - 2
services/eta_forum/eta_forum_hub.go

@@ -661,7 +661,7 @@ func ChartBatchUpdateAndUpload(chartClassifyInfo *data_manage.ChartClassify, sys
 		err = fmt.Errorf("系统处理中,请稍后重试!")
 		return
 	}
-	chartClassifyInfoList, err := data_manage.GetChartClassifyByLevelPath(chartClassifyInfo.LevelPath)
+	chartClassifyInfoList, err := data_manage.GetChartClassifyByLevelPath(chartClassifyInfo.LevelPath, chartClassifyInfo.Source)
 	if err != nil {
 		return
 	}
@@ -780,7 +780,7 @@ func ChartInfoDeleteBatch(chartClassifyInfo *data_manage.ChartClassify, sysUser
 		return
 	}
 	// 查询所有子分类
-	chartClassifyInfoList, err := data_manage.GetChartClassifyByLevelPath(chartClassifyInfo.LevelPath)
+	chartClassifyInfoList, err := data_manage.GetChartClassifyByLevelPath(chartClassifyInfo.LevelPath, chartClassifyInfo.Source)
 	if err != nil {
 		return
 	}