From 9753c2b5ce32409de6070bd1bebf0c455e4b37d9 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 16 Jan 2017 08:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 291761f..652fea0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -24,6 +24,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.math.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -991,10 +992,14 @@ public class BabyBookbuildingFacade { if (StringUtils.isNotEmpty(model.getDeliverOrg())) { - Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); - if (org != null) - { - result.setDeliverOrg(org.getName()); + if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())){ + Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); + if (org != null) + { + result.setDeliverOrg(org.getName()); + } + }else { + result.setDeliverOrg(model.getDeliverOrg()); } } -- 1.8.3.1