浏览代码

修复预测 EDB 信息列表未正确排序的问题

- 修改了 edb_info.go 中的查询语句,使用 edb_info_id 降序排列
- 优化了 predict_edb_rule_data.go 中的查询参数处理
- 增加了 predict_edb_info.go 中的额外条件检查,以确保结果的有效性
Roc 6 月之前
父节点
当前提交
df15bb6f81

+ 1 - 1
controllers/data_manage/predict_edb_info.go

@@ -260,7 +260,7 @@ func (this *PredictEdbInfoController) List() {
 		return
 	}
 
-	if edbInfoItem == nil || (err != nil && utils.IsErrNoRow(err)) {
+	if edbInfoItem == nil || (err != nil && utils.IsErrNoRow(err)) || edbInfoItem.EdbInfoId <= 0 {
 		item := new(data_manage.EdbInfoList)
 		resp.Paging = page
 		resp.Item = item

+ 1 - 1
models/data_manage/edb_info.go

@@ -1334,7 +1334,7 @@ func GetEdbInfoFilterList(condition string, pars []interface{}, startSize, pageS
 		return
 	}
 
-	sql = ` SELECT * FROM edb_info where 1=1 ` + condition + ` ORDER BY sort ASC, edb_info_id DESC  LIMIT ?,? `
+	sql = ` SELECT * FROM edb_info where 1=1 ` + condition + ` ORDER BY edb_info_id DESC  LIMIT ?,? `
 	pars = append(pars, startSize, pageSize)
 	err = o.Raw(sql, pars...).Scan(&list).Error
 

+ 1 - 1
models/data_manage/predict_edb_rule_data.go

@@ -45,6 +45,6 @@ func GetPredictEdbRuleDataList(edbInfoId, configId int, startDate, endDate strin
 		pars = append(pars, endDate)
 	}
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, edbInfoId, configId)).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, edbInfoId, configId)...).Find(&list).Error
 	return
 }