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 noteParams = streeNoteContent(ranking,dto); + noteParams.put("deptType","街道"); contentNote.put(mobile,noteParams); }else {//社区级账号 发送街道模板 //获取电话号 @@ -238,6 +239,7 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl noteParams = streeNoteContent(rankingCommunity,dto); + noteParams.put("deptType","社区"); contentNote.put(mobile,noteParams); } } @@ -324,7 +326,6 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl streeNoteContent(Integer ranking,UserAnalysisNoteDTO dto){ LinkedHashMap 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 mobiles = this.mobileHandle(formDto.getMobiles()); - // 发送短信通知 - this.sendNoticeNew(mobiles, templateDto,formDto); + this.sendNoticeNew(formDto.getMobiles(), templateDto,formDto); return new Result(); }