From d2de07ee9fcaeeecdcc13142e91bc218984ff35e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 16 Nov 2017 14:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index b4f4b33..96d3139 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -1030,11 +1030,9 @@ public class SmsConfigFacade { /** * 导出短信列表 * - * @param hospitalName 医院名称 * @param phone 手机号码 * @param smsType 短信类型 * @param smsStatus 短信状态 - * @param content 短信内容 * @param planTime 计划发送时间 * @param actualTime 实际发送时间 * @param objType 发送短信 @@ -1148,7 +1146,10 @@ public class SmsConfigFacade { //PUSH(1,"推送服务"), //PUSH_SMS(2,"推送和短信服务"), //SMS(3,"短信服务"); - map.put("serviceType", (obj.getServiceType() == 1 || obj.getServiceType() == 2) ? "推送消息" : "短信"); + if (obj.getServiceType() != null) + { + map.put("serviceType", (obj.getServiceType() == 1 || obj.getServiceType() == 2) ? "推送消息" : "短信"); + } map.put("dxStatus",SmsStatusEnums.getNameById(obj.getSmsStatus())); list.add(map); } -- 1.8.3.1