diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index ea49e52efa..22fc93d1a4 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -58,7 +58,7 @@ public class DataSetTableTaskService { public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception { checkName(dataSetTaskRequest); DatasetTableTask datasetTableTask = dataSetTaskRequest.getDatasetTableTask(); - if(!datasetTableTask.getType().equalsIgnoreCase("add_scope")){ + if(datasetTableTask.getType().equalsIgnoreCase("add_scope")){ dataSetTableService.saveIncrementalConfig(dataSetTaskRequest.getDatasetTableIncrementalConfig()); } // check diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 8f9f0e684b..99ce8a58ce 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -583,7 +583,7 @@ public class ExtractDataService { if (jobStatus.getStatusDescription().equals("Finished")) { return; } else { - DataEaseException.throwException((jobStatus.getErrorDescription())); + DataEaseException.throwException((jobStatus.getLoggingString())); } } diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue index 2632e5bd0a..218e8e6e0b 100644 --- a/frontend/src/views/system/task/TaskRecord.vue +++ b/frontend/src/views/system/task/TaskRecord.vue @@ -36,7 +36,7 @@ width="50%" class="dialog-css" > - {{ error_massage }} + {{ error_massage }} {{ $t('dataset.close') }} @@ -176,6 +176,16 @@ export default { margin-bottom: 10px; } +.err-msg{ + font-size: 12px; + word-break:normal; + width:auto; + display:block; + white-space:pre-wrap; + word-wrap : break-word ; + overflow: hidden ; +} + span{ font-size: 12px; }