diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml index b51d1e3d16..46bbce05dd 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml @@ -234,6 +234,7 @@ group by sa.auth_source ) pg_auth on pg_auth.id = pg.id where dt.id=#{datasetId,jdbcType=VARCHAR} + group by id,panel_id order by id diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml index e20645682e..49c1bfe889 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml @@ -239,6 +239,7 @@ group by sa.auth_source ) pg_auth on pg_auth.id = pg.id where ds.id=#{datasourceId,jdbcType=VARCHAR} + group by id,panel_id order by id diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml index 4c6343e5e3..8aebceeb0c 100644 --- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml @@ -285,7 +285,7 @@ ) group by sa.auth_source ) dt_auth on dt.id = dt_auth.id - join datasource ds on dt.data_source_id = ds.id + left join datasource ds on dt.data_source_id = ds.id left join ( select @@ -318,7 +318,8 @@ group by sa.auth_source ) ds_auth on ds_auth.id = ds.id where pg.id=#{panelId,jdbcType=VARCHAR} - group by dt.id + group by id,dt_id + order by id