Commit c6877772d7ab72de33213b21a154232e8e4d1842
1 parent
27dd6eb770
Exists in
master
and in
1 other branch
配置接口修改
Showing 1 changed file with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
c687777
| ... | ... | @@ -231,13 +231,16 @@ |
| 231 | 231 | SmsConfigModel model = smsmodels.get(0); |
| 232 | 232 | |
| 233 | 233 | |
| 234 | - if (StringUtils.isNotEmpty(model.getDeptPrefix())) | |
| 235 | - { | |
| 234 | + | |
| 236 | 235 | List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class); |
| 237 | 236 | if (CollectionUtils.isNotEmpty(deptsPrefixs)) |
| 238 | 237 | { |
| 239 | 238 | for (Map dept : deptsPrefixs) |
| 240 | 239 | { |
| 240 | + if (dept == null) | |
| 241 | + { | |
| 242 | + continue; | |
| 243 | + } | |
| 241 | 244 | //查询科室 并设置名称 |
| 242 | 245 | Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId")))); |
| 243 | 246 | if (qdetp != null) |
| ... | ... | @@ -281,7 +284,6 @@ |
| 281 | 284 | } |
| 282 | 285 | } |
| 283 | 286 | sr.setDeptPrefix(deptsPrefixs); |
| 284 | - } | |
| 285 | 287 | } |
| 286 | 288 | else |
| 287 | 289 | { |