From 5274179ce28d13bf5151a1223a8eb6223ad3a8b6 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 17 Jun 2022 14:01:02 +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 aaae03a61..521c8f85e 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
@@ -115,7 +115,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
      */
     @Override
     public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
-        DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
+        List<String> baseIdList = Arrays.asList(dummyInventoryBaseEO.getId().split(","));
+        List<DummyInventoryBaseEO> baseEOList = listByIds(baseIdList);
         List<String> createByNameList =new ArrayList<>();
         if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
             createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
@@ -124,14 +125,19 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 // 增加创建者校验
                 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
                 String loginUserName = sysUser.getUsername();
-
-                if (!baseEO.getCreateBy().contains(loginUserName)) {
-                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                        throw new JeroBootException("当前用户非创建者,无法编辑");
-                    } else {
-                        throw new JeroBootException("The current user is not the creator and cannot be edited.");
+                StringBuilder messageBuilder = new StringBuilder();
+                for (DummyInventoryBaseEO baseEO : baseEOList) {
+                    if (!baseEO.getCreateBy().contains(loginUserName)) {
+                        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.");
+                }
             }
         }