From 803e16b5dfab54ec9469eafb557a1f0fd8ee25a6 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 17 Jun 2022 16:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 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 521c8f85e..fc8136709 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
@@ -131,12 +131,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         messageBuilder.append(baseEO.getName()).append(",");
                     }
                 }
-                String message = messageBuilder.substring(0, messageBuilder.length() - 1);
-                if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                    throw new JeroBootException("当前用户非"+message+"的创建者,无法编辑");
-                } else {
-                    throw new JeroBootException(
-                            "The current user is not the creator of "+message+" and cannot be edited.");
+
+                if (StringUtils.isNotBlank(messageBuilder)) {
+                    String message = messageBuilder.substring(0, messageBuilder.length() - 1);
+                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+                        throw new JeroBootException("当前用户非" + message + "的创建者,无法编辑");
+                    } else {
+                        throw new JeroBootException(
+                                "The current user is not the creator of " + message + " and cannot be edited.");
+                    }
                 }
             }
         }
@@ -475,8 +478,11 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                 .eq("dummy_inventory_base_id",dummyInventoryBaseEO.getId())
                                 .eq("is_en_log",CutEnum.EN.getValue());
                         List<DummyLogEO> updateLogList = dummyLogEOService.list(logEOQueryWrapper);
-                        contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("</br>"));
 
+                        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>";
+                        }
                         iDummyContentChangeEOService.saveBatch(list);
                         sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());