From 99e360969334d163f78e8b4b41db4c7b25ce9d84 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 13 Oct 2017 15:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 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 03562b0..c8de6f0 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
@@ -13,6 +13,7 @@ import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.*;
+import org.apache.commons.lang.math.NumberUtils;
 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
 import com.lyms.platform.operate.web.request.BabyGuideSmsequest;
 import com.lyms.platform.operate.web.request.BabyManageRequest;
@@ -1324,25 +1325,19 @@ public class BabyBookbuildingFacade {
 
         if (StringUtils.isNotEmpty(model.getDeliverOrg()))
         {
+            result.setDeliverOrg(model.getDeliverOrg());
             if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())){
-                Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg()));
-                try{
-
-                }catch (Exception e){
-
-                }
-
-                if (org != null)
-                {
-                    result.setDeliverOrg(org.getName());
-                }
-            }else {
-                result.setDeliverOrg(model.getDeliverOrg());
+                    int orgId = NumberUtils.toInt(model.getDeliverOrg(), 0);
+                    if(orgId>0){
+                        Organization org = organizationService.getOrganization(orgId);
+                        if (org != null)
+                        {
+                            result.setDeliverOrg(org.getName());
+                        }
+                    }
             }
         }
 
-
-
         return result;
     }
 
-- 
1.8.3.1