diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index a32d4ee88..83ed551b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -429,10 +429,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList()); for(int i=0 ; i < contentLogList.size() ;i++){ - contentLog += "("+ (i+1) +")" + contentLogList.get(i) + "
"; + String content = contentLogList.get(i); + if(StringUtils.isNotBlank(content) && content.endsWith("
")){ + content = content.substring(0,content.length()-5); + } + contentLog += "("+ (i+1) +")" + content + "
"; } } } + if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("
")){ + contentLog = contentLog.substring(0,contentLog.length()-5); + } //列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理 if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) { @@ -481,7 +488,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList()); for(int i=0 ; i < contentLogList.size() ;i++){ - contentLog += "("+ (i+1) +")" + contentLogList.get(i) + "
"; + String content = contentLogList.get(i); + if(StringUtils.isNotBlank(content) && content.endsWith("
")){ + content = content.substring(0,content.length()-5); + } + contentLog += "("+ (i+1) +")" + content + "
"; + } + if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("
")){ + contentLog = contentLog.substring(0,contentLog.length()-5); } iDummyContentChangeEOService.saveBatch(list); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());