fix

controllers/data_manage/chart_public_classify.go

@@ -48,8 +48,7 @@ func (c *ChartPublicClassifyController) SimpleList() {
 
 	var sortList data_manage.ChartClassifyItemList
 	if parentId > 0 {
-
-		allChartInfo, err := data_manage.GetChartInfoByPublicClassifyId(parentId, 0, source)
+		allChartInfo, err := data_manage.GetChartInfoByPublicClassifyId(parentId, source)
 		if err != nil {
 			br.Msg = "获取指标数据失败"
 			br.ErrMsg = "获取指标数据失败，Err:" + err.Error()

models/data_manage/public_chart_info.go

@@ -14,17 +14,11 @@ import (
 // @param source int
 // @return items []*ChartClassifyItems
 // @return err error
-func GetChartInfoByPublicClassifyId(classifyId, chartInfoType, source int) (items []*ChartClassifyItems, err error) {
+func GetChartInfoByPublicClassifyId(classifyId, source int) (items []*ChartClassifyItems, err error) {
 	o := global.DmSQL["data"]
-	sql := ` SELECT chart_info_id,classify_id,chart_name AS classify_name,chart_name_en AS classify_name_en,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,chart_code,chart_type, sort,is_join_permission FROM chart_info WHERE chart_public_classify_id = ? AND chart_info_type = ?`
+	sql := ` SELECT chart_info_id,chart_classify_id,chart_public_classify_id,chart_name AS classify_name,chart_name_en AS classify_name_en,unique_code,source,sys_user_id,sys_user_real_name,start_date,chart_type, sort,is_join_permission FROM chart_info WHERE chart_public_classify_id = ? AND source = ?`
 
-	pars := []interface{}{classifyId, chartInfoType}
-
-	// 如果筛选了指标类型，那么就根据条件来
-	if source > 0 {
-		sql += ` AND source = ? `
-		pars = append(pars, source)
-	}
+	pars := []interface{}{classifyId, source}
 
 	sql += ` order by sort asc,chart_info_id asc `
 	err = o.Raw(sql, pars...).Scan(&items).Error

models/data_manage/public_edb_info.go

@@ -16,7 +16,7 @@ import (
 // @return err error
 func GetEdbInfoByPublicClassifyId(classifyId, edbInfoType, edbType int) (items []*EdbClassifyItems, err error) {
 	o := global.DmSQL["data"]
-	sql := ` SELECT edb_info_id,classify_id,edb_name AS classify_name,edb_name_en AS classify_name_en,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,edb_code,edb_type, sort,is_join_permission FROM edb_info WHERE edb_public_classify_id = ? AND edb_info_type = ?`
+	sql := ` SELECT edb_info_id,classify_id,edb_public_classify_id,edb_name AS classify_name,edb_name_en AS classify_name_en,unique_code,source_name,source,sys_user_id,sys_user_real_name,start_date,edb_code,edb_type, sort,is_join_permission FROM edb_info WHERE edb_public_classify_id = ? AND edb_info_type = ?`
 
 	pars := []interface{}{classifyId, edbInfoType}