Commit 92a039e003637bdc85d5f36e20caa48d270621a3
1 parent
a236cf7501
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 7 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
92a039e
| ... | ... | @@ -869,8 +869,14 @@ |
| 869 | 869 | */ |
| 870 | 870 | public List<SmsTemplateModel> getSendTemplateByServiceStatus(List<SmsTemplateModel> temps,Integer serviceType,Integer serviceStatus) |
| 871 | 871 | { |
| 872 | + if(serviceStatus == null && serviceType == null) | |
| 873 | + { | |
| 874 | + serviceStatus = ServiceStatusEnums.ALL.getId(); | |
| 875 | + serviceType = ServiceTypeEnums.ALL_SERVICE.getId(); | |
| 876 | + } | |
| 877 | + | |
| 872 | 878 | List<SmsTemplateModel> sendList = new ArrayList<>(); |
| 873 | - if (CollectionUtils.isNotEmpty(temps) && serviceStatus != null) { | |
| 879 | + if (CollectionUtils.isNotEmpty(temps)) { | |
| 874 | 880 | for (SmsTemplateModel temp : temps) { |
| 875 | 881 | if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { |
| 876 | 882 | sendList.add(temp); |