From fc0a9d37e0b465536f3ccbb0cc367959cbcf7947 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 30 Mar 2022 16:43:49 +0800
Subject: [PATCH] fff

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

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
index e098beaac6..5c42a0d00e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
@@ -151,7 +151,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
         //3.新增通知表信息
         if (formDTO.getChannel().size() > NumConstant.ZERO && StringUtils.isNotBlank(formDTO.getContent())) {
-            sendNotice(formDTO);
+            sendNotice(formDTO,agencyInfoCache.getOrganizationName());
         }
         return entity.getId();
     }
@@ -160,7 +160,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
      * 行程上报-发送通知
      * @param formDTO
      */
-    private void sendNotice(IcTripReportFormDTO formDTO) {
+    private void sendNotice(IcTripReportFormDTO formDTO,String agencyName) {
         SendNoticeFormDTO dto = new SendNoticeFormDTO();
         List<SendNoticeFormDTO.UserListBean> userList = new ArrayList<>();
         //注意这里的userId是指的pc平台的居民
@@ -171,7 +171,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         //通知来源 0 行程上报，1 疫苗接种，2 核酸检测
         dto.setOrigin(NumConstant.ZERO_STR);
         dto.setContent(formDTO.getContent());
-        dto.setOrgName(formDTO.getCurrentStaffId());
+        dto.setOrgName(agencyName);
+        dto.setStaffId(formDTO.getCurrentStaffId());
         icNoticeService.sendNotice(dto);
     }
 
@@ -225,7 +226,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
         //3.新增通知表信息
         if (formDTO.getChannel().size() > NumConstant.ZERO && StringUtils.isNotBlank(formDTO.getContent())) {
-            sendNotice(formDTO);
+            sendNotice(formDTO,agencyInfoCache.getOrganizationName());
         }
         return entity.getId();
     }