fix

controllers/data_manage/edb_info.go

@@ -3997,6 +3997,10 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 	//指标来源
 	source, _ := this.GetInt("Source")
 
+	frequency := this.GetString("Frequency") //频度
+
+	isAddPredictEdb, _ := this.GetBool("IsAddPredictEdb") //是否查询添加预测指标
+
 	var edbInfoList []*data_manage.EdbInfoList
 	var err error
 
@@ -4027,6 +4031,9 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 	} else {
 		var condition string
 		var pars []interface{}
+		// 普通指标
+		condition += ` AND edb_info_type = ? `
+		pars = append(pars, 0)
 
 		// 无权限指标id
 		lenNoPermissionEdbInfoIdList := len(noPermissionEdbInfoIdList)
@@ -4035,6 +4042,31 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 			pars = append(pars, noPermissionEdbInfoIdList)
 		}
 
+		switch filterSource {
+		case 2:
+			condition += ` AND frequency='月度' `
+		case 3:
+			condition += ` AND frequency <> '日度' `
+		case 4:
+			condition += ` AND edb_type = 1 `
+		case 5:
+			condition += ` AND source = 6 ` //来源（同比值）
+		case 6:
+			condition += ` AND frequency != ? `
+			pars = append(pars, "年度")
+		}
+
+		//频度
+		if frequency != "" {
+			condition += ` AND frequency = ? `
+			pars = append(pars, frequency)
+		}
+
+		// 查询只允许添加预测指标的搜索
+		if isAddPredictEdb {
+			condition += ` AND frequency in ("日度","周度","月度") `
+		}
+
 		total, edbInfoList, err = data_manage.GetEdbInfoFilterList(condition, pars, startSize, pageSize)
 	}
 	if err != nil {