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 c39911ff4f..2ecbe7ed6a 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -410,7 +410,9 @@ public class ExtractDataService { userIds.forEach(userId -> { Map param = new HashMap<>(); param.put("tableId", id); - param.put("taskId", taskId); + if(StringUtils.isNotEmpty(taskId)){ + param.put("taskId", taskId); + } DeMsgutil.sendMsg(userId, 1, "数据集【"+datasetTable.getName()+"】同步"+msg, gson.toJson(param)); }); } @@ -443,7 +445,7 @@ public class ExtractDataService { if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){ datasetTableTaskLog = datasetTableTaskLogs.get(0); datasetTableTaskLog.setStatus(JobStatus.Error.name()); - datasetTableTaskLog.setInfo(ExceptionUtils.getStackTrace(e)); + datasetTableTaskLog.setInfo(e.getMessage()); datasetTableTaskLog.setEndTime(System.currentTimeMillis()); dataSetTableTaskLogService.save(datasetTableTaskLog); } diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index de74858d22..3bd10fd436 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -71,7 +71,8 @@ width="50%" class="dialog-css" > - {{ error_massage }} + {{ error_massage }} + {{ $t('dataset.close') }} @@ -703,7 +704,17 @@ export default { overflow-y: auto; } - span{ + .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; }