From 018f12d85a461def2a0a0a576c2a833acad3c8d9 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 19 Dec 2016 11:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/MasterOrganization.xml    | 13 +++++++++----
 .../src/main/resources/mainOrm/slave/Organization.xml       | 12 ++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
index ef95cf7..6888ee1 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
@@ -21,19 +21,21 @@
         <result column="created" property="created" jdbcType="TIMESTAMP"/>
         <result column="shortCode" property="shortCode" jdbcType="VARCHAR"/>
         <result column="foreign_id" property="foreignId" jdbcType="VARCHAR"/>
+        <result column="bStatus" property="bStatus" jdbcType="INTEGER"/>
+
     </resultMap>
 
 
     <insert id="addOrganization" parameterType="com.lyms.platform.permission.model.Organization">
         <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
         insert into organization
-        (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id
+        (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id,bStatus
         <if test="id != null and id >= 0">
             ,id
         </if>
         )
         values
-        (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId}
+        (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId},#{bStatus}
         <if test="id != null and id >= 0">
             ,#{id}
         </if>
@@ -62,6 +64,9 @@
             <if test="provinceId != null">
                 province_id = #{provinceId,jdbcType=INTEGER},
             </if>
+            <if test="bStatus !=null">
+                bStatus=#{bStatus,jdbcType=INTEGER},
+            </if>
             <if test="cityId != null">
                 city_id = #{cityId,jdbcType=INTEGER},
             </if>
@@ -109,7 +114,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,status
+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,bStatus
  from organization where id = #{id,jdbcType=INTEGER}
 </select>
 
@@ -213,7 +218,7 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
     <select id="queryOrganization" resultMap="OrganizationResultMap"
             parameterType="com.lyms.platform.permission.model.OrganizationQuery">
         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
+        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,bStatus
         from organization
         <include refid="OrganizationCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-biz-service/src/main/resources/mainOrm/slave/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/slave/Organization.xml
index f52707b..c6d344b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/slave/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/slave/Organization.xml
@@ -21,19 +21,20 @@
         <result column="created" property="created" jdbcType="TIMESTAMP"/>
         <result column="shortCode" property="shortCode" jdbcType="VARCHAR"/>
         <result column="foreign_id" property="foreignId" jdbcType="VARCHAR"/>
+        <result column="bStatus" property="bStatus" jdbcType="INTEGER"/>
     </resultMap>
 
 
     <insert id="addOrganization" parameterType="com.lyms.platform.permission.model.Organization">
         <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
         insert into organization
-        (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id
+        (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id,bStatus
         <if test="id != null and id >= 0">
             ,id
         </if>
         )
         values
-        (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId}
+        (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId},#{bStatus}
         <if test="id != null and id >= 0">
             ,#{id}
         </if>
@@ -47,6 +48,9 @@
             <if test="foreignId != null and foreignId != ''">
                 foreign_id = #{foreignId,jdbcType=VARCHAR},
             </if>
+            <if test="bStatus !=null">
+                bStatus=#{bStatus,jdbcType=INTEGER},
+            </if>
             <if test="name != null and name != ''">
                 name = #{name,jdbcType=VARCHAR},
             </if>
@@ -109,7 +113,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,status
+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,bStatus
  from organization where id = #{id,jdbcType=INTEGER}
 </select>
 
@@ -213,7 +217,7 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
     <select id="queryOrganization" resultMap="OrganizationResultMap"
             parameterType="com.lyms.platform.permission.model.OrganizationQuery">
         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
+        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,bStatus
         from organization
         <include refid="OrganizationCondition"/>
         <include refid="orderAndLimit"/>
-- 
1.8.3.1