From 0daf8d09c2e3b4f12afe55a6e2872be9e9ca92ba Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sun, 24 Apr 2022 20:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81--=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 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 38b209c8a..2081859b5 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
@@ -215,8 +215,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ","));
             List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
 
-            String content = sysUser.getRealname() + "删除了" + StringUtils.join(serialNumberList, ",") + "请知晓";
-            String contentInfo = sysUser.getRealname() + "删除了" + sbStr + "请知晓";
+            String content = sysUser.getUsername() + "删除了" + StringUtils.join(serialNumberList, ",") + "请知晓";
+            String contentInfo = sysUser.getUsername() + "删除了" + sbStr + "请知晓";
             //封装消息的实体类
             SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -1551,8 +1551,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String title = (String) map.get("title");
             String serialNumber = (String) map.get("serial_number");
             String href = backUrl + "/docManage/library/detail?id=" + idTemp;
-            String content = sysUser.getRealname() + "新增了" + serialNumber + "，请及时查看";
-            String contentInfo = sysUser.getRealname() + "新增了" + href + "，请及时查看";
+            String content = sysUser.getUsername() + "新增了" + serialNumber + "，请及时查看";
+            String contentInfo = sysUser.getUsername() + "新增了" + href + "，请及时查看";
             //封装消息的实体类
             SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -1995,7 +1995,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             BussLogEO bussLogEO = new BussLogEO();
             bussLogEO.setDocumentId((String) map.get("id"));
             bussLogEO.setContent(content);
-            bussLogEO.setCreateBy(sysUser.getRealname());
+            bussLogEO.setCreateBy(sysUser.getUsername());
             iBussLogEOService.add(bussLogEO);
         }
     }
@@ -2202,8 +2202,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String url = backUrl + "/docManage/library/detail?id=" + id;
 
             if (StringUtils.isNotBlank(sbStr.toString())) {
-                String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改，请及时查看";
-                String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString();
+                String content = sysUser.getUsername() + "对" + serialNumber + "进行了修改，请及时查看";
+                String contentInfo = sysUser.getUsername() + "修改标准" + href + "中" + sbStr.toString();
                 //封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -2211,7 +2211,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             }
             //飞书
             try {
-                String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改，请及时查看";
+                String content = sysUser.getUsername() + "对" + serialNumber + "进行了修改，请及时查看";
                 iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.READ.getName(), url);
             } catch (IOException e) {
                 log.error("文档新增飞书消息推送失败");
@@ -3645,8 +3645,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.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + "Please pay attention to check.";
+        String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + "Please pay attention to check.";
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -3660,7 +3660,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         list.add(serialNumber);
                     }
                 });
-                String contentTemp = sysUser.getRealname() + "向您推送了" + StringUtils.join(list, ",") + "，请注意查看。";
+                String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + ",Please pay attention to check.";
                 iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), s);
             }
         } catch (IOException e) {