diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java index 77301e3..10e7ae4 100644 --- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java @@ -863,8 +863,8 @@ public class CommonServiceImpl implements CommonService { continue; } - // Attachment,插入更新时把Name中的/替换为- - if ("Attachment".equals(one.getName()) && "Name".equals(key)){ + // Document,Attachment,插入更新时把Name中的/替换为- + if (("Document".equals(one.getName()) || "Attachment".equals(one.getName())) && "Name".equals(key)){ String name = StringUtils.replace(String.valueOf(jsonObject.get("Name")), "/", "-"); Map paramMap = Maps.newHashMap(); paramMap.put("key", "Name"); diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java index 2082e02..c5b7150 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java @@ -1064,7 +1064,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService { TimeUnit.MILLISECONDS.sleep(1); QueryWrapper obQw = new QueryWrapper<>(); dbQw.eq("api", api); - DataObject dataObject = dataObjectService.getOne(obQw); + DataObject dataObject = dataObjectService.list(obQw).get(0); String beginDateStr = null; String endDateStr = null;