From 4c5bb9102eae3069717b97f8e56a96bf55217fd1 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 26 Jul 2016 14:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-biz-service/src/main/resources/mainOrm/Organization.xml        | 2 +-
 platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java   | 1 +
 .../main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
index 33dde55..b54cfd6 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
@@ -99,7 +99,7 @@ delete from organization where id = #{id,jdbcType=INTEGER}
 
 
     <select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
-select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id
+select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
  from organization where id = #{id,jdbcType=INTEGER}
 </select>
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java
index 88fd4d4..00dab83 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java
@@ -50,6 +50,7 @@ public class SmsConfigModel extends BaseModel {
     //高危配置
     private String highConfig;
 
+
     public String getHighConfig() {
         return highConfig;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
index f0bf50d..f6039dd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
@@ -378,7 +378,7 @@ public class SmsConfigFacade {
 			String address = org.getAddress();
 			allAddress+=address;
 			hospital.put("address", allAddress);
-			hospital.put("status",org.getStatus()+"");
+			hospital.put("status",org.getStatus() == null ? "" : String.valueOf(org.getStatus()));
 			hospital.put("remark", "");
 		}
 		SmsConfigQuery query = new SmsConfigQuery();
-- 
1.8.3.1