fix

virgo.api/src/main/java/com/bosshand/virgo/api/model/Merchant.java

@@ -97,6 +97,11 @@ public class Merchant {
      */
     private String data;
 
+    /**
+     * 房间ids
+     */
+    private String roomIds;
+
     public long getId() {
         return id;
     }
@@ -248,4 +253,12 @@ public class Merchant {
     public void setData(String data) {
         this.data = data;
     }
+
+    public String getRoomIds() {
+        return roomIds;
+    }
+
+    public void setRoomIds(String roomIds) {
+        this.roomIds = roomIds;
+    }
 }

virgo.api/src/main/resources/mapper/MerchantMapper.xml

@@ -26,11 +26,12 @@
         <result column="registeredCapital" property="registeredCapital"/>
         <result column="status" property="status"/>
         <result column="data" property="data"/>
+        <result column="roomIds" property="roomIds"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Merchant" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO merchant(`address`, `businessScope`, `corporateScale`, `corporatePhilosophy`, `corporateCulture`, `contactInformation`, `fax`, `email`, `organizationId`, `projectId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`)
-        VALUES (#{address}, #{businessScope}, #{corporateScale}, #{corporatePhilosophy}, #{corporateCulture}, #{contactInformation}, #{fax}, #{email}, #{organizationId}, #{projectId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data})
+        INSERT INTO merchant(`address`, `businessScope`, `corporateScale`, `corporatePhilosophy`, `corporateCulture`, `contactInformation`, `fax`, `email`, `organizationId`, `projectId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`, `roomIds`)
+        VALUES (#{address}, #{businessScope}, #{corporateScale}, #{corporatePhilosophy}, #{corporateCulture}, #{contactInformation}, #{fax}, #{email}, #{organizationId}, #{projectId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data}, #{roomIds})
     </insert>
 
     <delete id="delete">
@@ -59,6 +60,7 @@
             <if test="registeredCapital!=null">registeredCapital=#{registeredCapital},</if>
             <if test="status!=null">status=#{status},</if>
             <if test="data!=null">data=#{data},</if>
+            <if test="roomIds!=null">roomIds=#{roomIds},</if>
         </trim>
         WHERE id=#{id}
     </update>
@@ -88,7 +90,8 @@
             <if test="businessTerm!=null">and businessTerm=#{businessTerm}</if>
             <if test="registeredCapital!=null">and registeredCapital=#{registeredCapital}</if>
             <if test="status!=null">and status=#{status}</if>
-            <if test="data!=null">and data=#{data},</if>
+            <if test="data!=null">and data=#{data}</if>
+            <if test="roomIds!=null">and roomIds=#{roomIds}</if>
         </where>
     </select>
 
@@ -113,7 +116,8 @@
             <if test="businessTerm!=null">and businessTerm=#{businessTerm}</if>
             <if test="registeredCapital!=null">and registeredCapital=#{registeredCapital}</if>
             <if test="status!=null">and status=#{status}</if>
-            <if test="data!=null">and data=#{data},</if>
+            <if test="data!=null">and data=#{data}</if>
+            <if test="roomIds!=null">and roomIds=#{roomIds}</if>
         </where>
     </select>
 
@@ -138,7 +142,8 @@
             <if test="p.businessTerm!=null">and businessTerm=#{p.businessTerm}</if>
             <if test="p.registeredCapital!=null">and registeredCapital=#{p.registeredCapital}</if>
             <if test="p.status!=null">and status=#{p.status}</if>
-            <if test="p.data!=null">and data=#{p.data},</if>
+            <if test="p.data!=null">and data=#{p.data}</if>
+            <if test="p.roomIds!=null">and roomIds=#{p.roomIds}</if>
         </where>
         limit #{currIndex} , #{pageSize}
     </select>

virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrOrganization.java

@@ -56,8 +56,6 @@ public class MgrOrganization implements BaseModel {
 
     private String organizationCode;
 
-    private String roomIds;
-
     public long getId() {
         return id;
     }
@@ -170,11 +168,4 @@ public class MgrOrganization implements BaseModel {
         this.organizationCode = organizationCode;
     }
 
-    public String getRoomIds() {
-        return roomIds;
-    }
-
-    public void setRoomIds(String roomIds) {
-        this.roomIds = roomIds;
-    }
 }

virgo.core/src/main/resources/mapper/MgrOrganizationMapper.xml

@@ -17,7 +17,6 @@
 	<result column="status" property="status"/>
 	<result column="organizedDataCenter" property="organizedDataCenter"/>
 	<result column="organizationCode" property="organizationCode"/>
-	<result column="roomIds" property="roomIds"/>
 </resultMap>
 
 <select id="getById" resultMap="MgrOrganizationResult">
@@ -93,8 +92,8 @@
 </select>
 
 <insert id="insert" parameterType="com.bosshand.virgo.core.model.MgrOrganization" useGeneratedKeys="true" keyProperty="id">
-	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode, roomIds)
-	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode}, #{roomIds})
+	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode)
+	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode})
 </insert>
 
 <update id="update" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
@@ -110,7 +109,6 @@
 		<if test="introduction!=null">introduction=#{introduction},</if>
 		<if test="registerDate!=null">registerDate=#{registerDate},</if>
 		<if test="organizedDataCenter!=0">organizedDataCenter=#{organizedDataCenter},</if>
-		<if test="roomIds!=null">roomIds=#{roomIds},</if>
 	</trim>
 	WHERE id=#{id}
 </update>