Merge remote-tracking branch 'origin2/dev' into origin2-dev

src/main/resources/mapper/carrier/BuildingDao.xml

@@ -45,10 +45,10 @@
         left join s_street s on s.id = p.street_id
         where b.del_flag = 0 and b.is_use = 1 and f.is_use = 1 and f.del_flag = 0 and p.is_start = 1 and p.del_flag = 0
         <if test="query.streetId != null and query.streetId != ''">
-            and s.id = #{query.streetId}
+            and s.id in ( #{query.streetId} )
         </if>
         <if test="query.parkId != null and query.parkId != ''">
-            and p.id = #{query.parkId}
+            and p.id in (#{query.parkId})
         </if>
         <choose>
             <when test="query.count != null and query.count == 1">
@@ -197,13 +197,13 @@
             </otherwise>
         </choose>
         <if test="query.carrierAttriute != null and query.carrierAttriute != ''">
-            and b.carrier_attriute = #{query.carrierAttriute}
+            and b.carrier_attriute in (#{query.carrierAttriute})
         </if>
         <if test="query.carrierNature != null and query.carrierNature != ''">
             and b.carrier_nature = #{query.carrierNature}
         </if>
         <if test="query.carrierStructure != null and query.carrierStructure != ''">
-            and b.carrier_structure = #{query.carrierStructure}
+            and b.carrier_structure in (#{query.carrierStructure})
         </if>
 
         <if test="query.landingPlatformCount != null and query.landingPlatformCount != ''">
@@ -213,7 +213,7 @@
             and b.intercolumniation >= #{query.intercolumniation}
         </if>
         <if test="query.spqn != null and query.spqn != ''">
-            and b.spqn = #{query.spqn}
+            and b.spqn in (#{query.spqn})
         </if>
 
         <if test="query.liftLoadBearing != null and query.liftLoadBearing != ''">
@@ -226,7 +226,7 @@
              and b.floor_height is not null  and b.floor_height >= #{query.floorHeight}
         </if>
         <if test="query.build_use != null and query.build_use != ''">
-            and b.build_use = #{query.build_use}
+            and b.build_use in (#{query.build_use})
         </if>
 
     </select>