From 1b4a9d8ad6f825446925dbb4708e63f7498eaf1d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 23 Mar 2022 19:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 3f46704ed..55d5206cd 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
@@ -213,7 +213,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 String title = (String) map.get("title");
                 serialNumberList.add(serialNumber);
 
-                String href = "<a href='/docManage/library?id:" + id +
+                String href = "<a href='/docManage/library/detail?id:" + id +
                         "&title:" + title +
                         "&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
                 sb.append(href);
@@ -1300,7 +1300,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             String title = (String) map.get("title");
             String serialNumber = (String) map.get("serial_number");
-            String href = "<a href='/docManage/library?id:" + idTemp +
+            String href = "<a href='/docManage/library/detail?id:" + idTemp +
                     "&title:" + title +
                     "&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
 
@@ -1718,7 +1718,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         String id = (String) map.get("id");
         String title = (String) map.get("title");
-        String href = "<a href='/docManage/library?id:" + id +
+        String href = "<a href='/docManage/library/detail?id:" + id +
                 "&title:" + title +
                 "&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
 
@@ -1777,7 +1777,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             userNameListTemp.add((String) stringObjectMap.get("create_by"));
             serialNumberList.add(serialNumber);
 
-            String href = "<a href='/docManage/library?id:" + id +
+            String href = "<a href='/docManage/library/detail?id:" + id +
                     "&title:" + title +
                     "&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
             sb.append(href);
@@ -2918,16 +2918,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public String pullMessage(String departIds, String userIds, String documentIds) {
-        departIds = "c6d7cb4deeac411cb3384b1b31278596";
+//        departIds = "c6d7cb4deeac411cb3384b1b31278596";
 //        if(StringUtils.isBlank(documentIds)){
 //            return "请选择文档";
 //        }
         List<String> userIdList = new ArrayList<>();
+        List<String> thirdIdList = new ArrayList<>();
         if (StringUtils.isNotBlank(departIds)) {
             //查询部门下的人员
             List<SysUser> userList = sysUserService.getUserListByDepIds(Arrays.asList(departIds.split(",")));
             if (userList.size() != 0) {
                 userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+                thirdIdList = userList.stream().map(SysUser::getThirdId).collect(Collectors.toList());
             }
         }
 
@@ -2946,7 +2948,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         //飞书
         try {
-            iFeishuService.batchSendMessage(new String[userIdList.size()], content, null, null);
+            iFeishuService.batchSendMessage(new String[thirdIdList.size()], content, "转发推送", null);
         } catch (IOException e) {
             log.error("飞书推送失败");
         }