Commit d2de07ee9fcaeeecdcc13142e91bc218984ff35e
1 parent
b308802a46
Exists in
master
and in
6 other branches
短信修改
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
d2de07e
| ... | ... | @@ -1030,11 +1030,9 @@ |
| 1030 | 1030 | /** |
| 1031 | 1031 | * 导出短信列表 |
| 1032 | 1032 | * |
| 1033 | - * @param hospitalName 医院名称 | |
| 1034 | 1033 | * @param phone 手机号码 |
| 1035 | 1034 | * @param smsType 短信类型 |
| 1036 | 1035 | * @param smsStatus 短信状态 |
| 1037 | - * @param content 短信内容 | |
| 1038 | 1036 | * @param planTime 计划发送时间 |
| 1039 | 1037 | * @param actualTime 实际发送时间 |
| 1040 | 1038 | * @param objType 发送短信 |
| ... | ... | @@ -1148,7 +1146,10 @@ |
| 1148 | 1146 | //PUSH(1,"推送服务"), |
| 1149 | 1147 | //PUSH_SMS(2,"推送和短信服务"), |
| 1150 | 1148 | //SMS(3,"短信服务"); |
| 1151 | - map.put("serviceType", (obj.getServiceType() == 1 || obj.getServiceType() == 2) ? "推送消息" : "短信"); | |
| 1149 | + if (obj.getServiceType() != null) | |
| 1150 | + { | |
| 1151 | + map.put("serviceType", (obj.getServiceType() == 1 || obj.getServiceType() == 2) ? "推送消息" : "短信"); | |
| 1152 | + } | |
| 1152 | 1153 | map.put("dxStatus",SmsStatusEnums.getNameById(obj.getSmsStatus())); |
| 1153 | 1154 | list.add(map); |
| 1154 | 1155 | } |