diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index bf8180936c..ca08b805c6 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -1022,6 +1022,7 @@ public class ExtractDataService { case pg: PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class); dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfiguration.getHost().trim(), pgConfiguration.getDataBase(), pgConfiguration.getPort().toString(), pgConfiguration.getUsername(), pgConfiguration.getPassword()); + dataMeta.setPreferredSchemaName(pgConfiguration.getSchema()); transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, pgConfiguration); udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration, isSetKey); diff --git a/core/frontend/src/views/dataFilling/myTask/index.vue b/core/frontend/src/views/dataFilling/myTask/index.vue index 9fb3fda732..22922741a6 100644 --- a/core/frontend/src/views/dataFilling/myTask/index.vue +++ b/core/frontend/src/views/dataFilling/myTask/index.vue @@ -120,29 +120,29 @@ export default { myTaskHandleSizeChange(pageSize) { this.myTaskPaginationConfig.currentPage = 1 this.myTaskPaginationConfig.pageSize = pageSize - this.searchTableData() + this.searchTableMyTaskData() }, myTaskHandleCurrentChange(currentPage) { this.myTaskPaginationConfig.currentPage = currentPage - this.searchTableData() + this.searchTableMyTaskData() }, finishedTaskHandleSizeChange(pageSize) { this.finishedTaskPaginationConfig.currentPage = 1 this.finishedTaskPaginationConfig.pageSize = pageSize - this.searchTableData() + this.searchTableFinishedTaskData() }, finishedTaskHandleCurrentChange(currentPage) { this.finishedTaskPaginationConfig.currentPage = currentPage - this.searchTableData() + this.searchTableFinishedTaskData() }, expiredTaskHandleSizeChange(pageSize) { this.expiredTaskPaginationConfig.currentPage = 1 this.expiredTaskPaginationConfig.pageSize = pageSize - this.searchTableData() + this.searchTableExpiredTaskData() }, expiredTaskHandleCurrentChange(currentPage) { this.expiredTaskPaginationConfig.currentPage = currentPage - this.searchTableData() + this.searchTableExpiredTaskData() }, getRestTime(time) { if (!time) {