From 650e0b6f0e9a3f2d33c8304c23efd08a51fab796 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 21 Jun 2022 14:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83--=E7=AB=99=E5=86=85=E6=B6=88=E6=81=AF=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

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<DummyInventoryB
                             if(CollectionUtils.isNotEmpty(updateLogList)){
                                 List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
                                 for(int i=0 ; i < contentLogList.size() ;i++){
-                                    contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
+                                    String content = contentLogList.get(i);
+                                    if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
+                                        content = content.substring(0,content.length()-5);
+                                    }
+                                    contentLog += "（"+ (i+1) +"）" + content + "</br>";
                                 }
                             }
                         }
+                        if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
+                            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<DummyInventoryB
 
                         List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
                         for(int i=0 ; i < contentLogList.size() ;i++){
-                            contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
+                            String content = contentLogList.get(i);
+                            if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
+                                content = content.substring(0,content.length()-5);
+                            }
+                            contentLog += "（"+ (i+1) +"）" + content + "</br>";
+                        }
+                        if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
+                            contentLog = contentLog.substring(0,contentLog.length()-5);
                         }
                         iDummyContentChangeEOService.saveBatch(list);
                         sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());