From bc12a99c3156d9a25104e5a8371e07eae4862331 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Wed, 25 Nov 2020 14:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8C=87=E6=A0=87=E5=B1=95=E7=A4=BA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=91=E9=AD=8F=E5=87=AF?=
 =?UTF-8?q?=202020-11-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java | 3 ++-
 .../esua/epdc/service/impl/SmsTemplateServiceImpl.java      | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java
index 819425900..e361e0652 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java
@@ -229,6 +229,7 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
               Integer ranking = streeRanking.get(dto.getDeptId());
               //组装短信内容参数
                LinkedHashMap<String, String>  noteParams = streeNoteContent(ranking,dto);
+               noteParams.put("deptType","街道");
                contentNote.put(mobile,noteParams);
            }else {//社区级账号 发送街道模板
                //获取电话号
@@ -238,6 +239,7 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
                Integer rankingCommunity = communiytRanking.get(dto.getDeptId());
                //组装短信内容参数
                LinkedHashMap<String, String>  noteParams = streeNoteContent(rankingCommunity,dto);
+               noteParams.put("deptType","社区");
                contentNote.put(mobile,noteParams);
            }
         }
@@ -324,7 +326,6 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
     private  LinkedHashMap<String, String> streeNoteContent(Integer ranking,UserAnalysisNoteDTO dto){
         LinkedHashMap<String, String> noteParams = new LinkedHashMap<>();
         noteParams.put("deptName",dto.getDeptName());
-        noteParams.put("deptType","街道");
         noteParams.put("month",getLastMonth());
         noteParams.put("sort",ranking.toString());
         noteParams.put("code",dto.getDeptId());
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java
index 239da915b..5c9fe1e31 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java
@@ -182,12 +182,8 @@ public class SmsTemplateServiceImpl extends BaseServiceImpl<SmsTemplateDao, SmsT
         if (null == templateDto) {
             return new Result().error("未查询到模板信息");
         }
-
-        // 手机号处理
-        List<String> mobiles = this.mobileHandle(formDto.getMobiles());
-
         // 发送短信通知
-        this.sendNoticeNew(mobiles, templateDto,formDto);
+        this.sendNoticeNew(formDto.getMobiles(), templateDto,formDto);
 
         return new Result();
     }