bug修改

src/main/resources/mapper/TaBuildingMapper.xml

@@ -119,7 +119,7 @@
                 </if>
                 <if test="buildingArea != null">
                     AND building_area in
-                    <foreach collection="buildingAreaLisr" item="buildingList" open="(" close=")" separator=" OR ">
+                    <foreach collection="buildingAreaLisr" item="buildingList" open="(" close=")" separator=" , ">
                      #{buildingList}
                     </foreach>
                 </if>
@@ -150,6 +150,44 @@
                 left JOIN
                 (
                 SELECT * FROM ta_building_project_type
+                <trim prefix="where" prefixOverrides="and | or">
+                    <if test="priceList != null and priceList.size > 0">
+                        <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
+                            (
+                            <if test='priceArr[0] != null and priceArr[0] != ""'>
+                                <![CDATA[ start_price > ${priceArr[0]}  ]]>
+                            </if>
+                            <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
+                                AND
+                            </if>
+                            <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
+                                <![CDATA[ start_price <= ${priceArr[1]}  ]]>
+                            </if>
+                            )  or
+                            (
+                            <if test='priceArr[0] != null and priceArr[0] != ""'>
+                                <![CDATA[ end_price > ${priceArr[0]}  ]]>
+                            </if>
+                            <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
+                                AND
+                            </if>
+                            <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
+                                <![CDATA[ end_price <= ${priceArr[1]}  ]]>
+                            </if>
+                            )
+                        </foreach>
+                        <if test="priceType != null and priceType != ''">
+                            and price_type = #{priceType}
+                        </if>
+                    </if>
+
+                    <if test="buildingTypeList != null and buildingTypeList.length > 0">
+                        AND building_type_id in
+                        <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">
+                            #{buildingType}
+                        </foreach>
+                    </if>
+                </trim>
                 GROUP BY building_id
                 )
                 AS tbpt ON tb.building_id = tbpt.building_id
@@ -159,7 +197,7 @@
                 (
                 SELECT * FROM ta_building_apartment
                 <trim prefix="where" prefixOverrides="and | or">
-                    <if test="areaList != null">
+                    <if test="areaList != null and areaList.size > 0">
                         <foreach collection="areaList" item="areaArr" open="(" close=")" separator=" OR ">
                             (
                                 <if test='areaArr[0] != null and areaArr[0] != ""'>
@@ -186,7 +224,7 @@
                 ) as tba ON tb.building_id = tba.building_id
             </if>
         <trim prefix="where" prefixOverrides="and | or">
-            <if test="priceList != null">
+            <if test="priceList != null and priceList.size > 0">
                 <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                     (
                     <if test='priceArr[0] != null and priceArr[0] != ""'>
@@ -211,13 +249,12 @@
                     </if>
                     )
                 </foreach>
+                <if test="priceType != null and priceType != ''">
+                    and tbpt.price_type = #{priceType}
+                </if>
             </if>
 
             and tb.org_id = #{orgId}
-            <if test="priceType != null and priceType != ''">
-                and tbpt.price_type = #{priceType}
-            </if>
-
             <if test="buildingTypeList != null and buildingTypeList.length > 0">
                 AND tbpt.building_type_id in
                 <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">