Merge pull request #9812 from dataease/pr@dev-v2@fix_filter

fix(仪表板): 过滤组件排序字段加入查询
This commit is contained in:
Junjun 2024-05-23 17:18:26 +08:00 committed by GitHub
commit 2701a3f323
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -532,6 +532,13 @@ public class DatasetDataManage {
boolean crossDs = false;
Map<Long, DatasourceSchemaDTO> dsMap = null;
if (ObjectUtils.isNotEmpty(request.getSortId())) {
// 如果排序字段和查询字段显示字段不一致则加入到查询列表中
if (!request.getSortId().equals(request.getQueryId()) && !request.getSortId().equals(request.getDisplayId())) {
ids.add(request.getSortId());
}
}
for (Long id : ids) {
DatasetTableFieldDTO field = datasetTableFieldManage.selectById(id);
if (field == null) {