Commit 99e360969334d163f78e8b4b41db4c7b25ce9d84
1 parent
9ebf05aa94
Exists in
master
and in
1 other branch
听力诊断模块
Showing 1 changed file with 10 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
99e3609
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | import com.lyms.platform.common.result.BaseObjectResponse; |
14 | 14 | import com.lyms.platform.common.result.BaseResponse; |
15 | 15 | import com.lyms.platform.common.utils.*; |
16 | +import org.apache.commons.lang.math.NumberUtils; | |
16 | 17 | import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; |
17 | 18 | import com.lyms.platform.operate.web.request.BabyGuideSmsequest; |
18 | 19 | import com.lyms.platform.operate.web.request.BabyManageRequest; |
19 | 20 | |
20 | 21 | |
... | ... | @@ -1324,24 +1325,18 @@ |
1324 | 1325 | |
1325 | 1326 | if (StringUtils.isNotEmpty(model.getDeliverOrg())) |
1326 | 1327 | { |
1328 | + result.setDeliverOrg(model.getDeliverOrg()); | |
1327 | 1329 | if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())){ |
1328 | - Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); | |
1329 | - try{ | |
1330 | - | |
1331 | - }catch (Exception e){ | |
1332 | - | |
1333 | - } | |
1334 | - | |
1335 | - if (org != null) | |
1336 | - { | |
1337 | - result.setDeliverOrg(org.getName()); | |
1338 | - } | |
1339 | - }else { | |
1340 | - result.setDeliverOrg(model.getDeliverOrg()); | |
1330 | + int orgId = NumberUtils.toInt(model.getDeliverOrg(), 0); | |
1331 | + if(orgId>0){ | |
1332 | + Organization org = organizationService.getOrganization(orgId); | |
1333 | + if (org != null) | |
1334 | + { | |
1335 | + result.setDeliverOrg(org.getName()); | |
1336 | + } | |
1337 | + } | |
1341 | 1338 | } |
1342 | 1339 | } |
1343 | - | |
1344 | - | |
1345 | 1340 | |
1346 | 1341 | return result; |
1347 | 1342 | } |