From 3c73700ed78675a1bed9cbf036bb4a678626bdc5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 24 Mar 2022 20:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 36177fbe9..da89b858e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3030,8 +3030,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String content = sysUser.getRealname() + "向内推送了" + StringUtils.join(serialNumberList, ",") + "，请注意查看。";
-        String contentInfo = sysUser.getRealname() + "向内推送了" + StringUtils.join(hrefList, ",") + "请注意查看。";
+        String content = sysUser.getRealname() + "向您推送了" + StringUtils.join(serialNumberList, ",") + "，请注意查看。";
+        String contentInfo = sysUser.getRealname() + "向您推送了" + StringUtils.join(hrefList, ",") + "请注意查看。";
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -3336,9 +3336,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             if (itemNameList.contains(value)) {
                                 String finalValue = value;
                                 List<SysDictItem> collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList());
-                                value = collect.get(0).getItemValue();
+                                if(collect.size() != 0){
+                                    value = collect.get(0).getItemValue();
+                                }
                             }
-
                         } else if (FieldTypeEnum.PULL_MORE.getValue().equals(fieldShowType)) {
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {