From 616dddf622a318a6a166c15e122034ab0ce01fbe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 30 Mar 2022 09:50:32 +0800
Subject: [PATCH] =?UTF-8?q?29=E8=84=9A=E6=9C=AC=EF=BC=8C=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=A0=E5=85=A5staffId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 8 ++++----
 ...fy_trip_report.sql => V0.0.29__modify_trip_report.sql} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.28__modify_trip_report.sql => V0.0.29__modify_trip_report.sql} (100%)

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 e1c58337fa..5396bc8307 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
@@ -137,7 +137,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
         //3.新增通知表信息
         if (formDTO.getChannel().size() > NumConstant.ZERO && StringUtils.isNotBlank(formDTO.getContent())) {
-            sendNotice(formDTO,agencyInfoCache.getOrganizationName());
+            sendNotice(formDTO);
         }
         return entity.getId();
     }
@@ -146,7 +146,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
      * 行程上报-发送通知
      * @param formDTO
      */
-    private void sendNotice(IcTripReportFormDTO formDTO,String agencyName) {
+    private void sendNotice(IcTripReportFormDTO formDTO) {
         SendNoticeFormDTO dto = new SendNoticeFormDTO();
         List<SendNoticeFormDTO.UserListBean> userList = new ArrayList<>();
         //注意这里的userId是指的pc平台的居民
@@ -157,7 +157,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         //通知来源 0 行程上报，1 疫苗接种，2 核酸检测
         dto.setOrigin(NumConstant.ZERO_STR);
         dto.setContent(formDTO.getContent());
-        dto.setOrgName(agencyName);
+        dto.setOrgName(formDTO.getCurrentStaffId());
         icNoticeService.sendNotice(dto);
     }
 
@@ -211,7 +211,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
         //3.新增通知表信息
         if (formDTO.getChannel().size() > NumConstant.ZERO && StringUtils.isNotBlank(formDTO.getContent())) {
-            sendNotice(formDTO,agencyInfoCache.getOrganizationName());
+            sendNotice(formDTO);
         }
         return entity.getId();
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.28__modify_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.29__modify_trip_report.sql
similarity index 100%
rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.28__modify_trip_report.sql
rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.29__modify_trip_report.sql