From 5916639613c8dc47009a40e7441e6f6c70f27987 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 21 Sep 2022 14:23:35 +0800
Subject: [PATCH] sendOrigin :send_button

---
 .../main/java/com/epmet/dto/form/SendNoticeFormDTO.java    | 7 +++++++
 .../java/com/epmet/service/impl/IcNoticeServiceImpl.java   | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
index 75a2eee8e0..d02427baf2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
@@ -18,6 +18,10 @@ import java.util.List;
 @Data
 public class SendNoticeFormDTO implements Serializable {
     private static final long serialVersionUID = 4800907725063604885L;
+    /**
+     * 单独点击发送通知按钮：send_button
+     */
+    private String sendOrigin;
     private String customerId;
     private String staffId;
     /**
@@ -60,5 +64,8 @@ public class SendNoticeFormDTO implements Serializable {
          * 身份证
          */
         private String idCard;
+
+
+        private String realIdCard;
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
index bab4d5e5a6..bdc0585028 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
@@ -145,7 +145,11 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
             entity.setOrigin(formDTO.getOrigin());
             entity.setUserId(item.getUserId());
             entity.setMobile(item.getMobile());
-            entity.setIdCard(item.getIdCard());
+            if (StringUtils.isNotBlank(formDTO.getSendOrigin()) && "send_button".equals(formDTO.getSendOrigin())) {
+                entity.setIdCard(item.getRealIdCard());
+            } else {
+                entity.setIdCard(item.getIdCard());
+            }
             entity.setOrgName(finalOrgName);
             // 发送结果：1成功,0失败
             entity.setSendRes(NumConstant.ONE_STR);