bug fix

src/main/resources/mapper/TaBuildingMapper.xml

@@ -89,7 +89,7 @@
                 <if test="cityId != null">
                     AND city_id = #{cityId}
                 </if>
-                <if test="targets != null">
+                <if test="targets != null and targets.size > 0">
                     AND building_id IN
                     <foreach collection="targets" item="buildingId" open="(" close=")" separator=",">
                         #{buildingId}
@@ -101,8 +101,8 @@
                 </if>
             ) as tb
 
-            <if test="priceList != null or buildingTypeList != null">
-                LEFT JOIN
+            <if test="(priceList != null and priceList.size > 0) or (buildingTypeList != null and buildingTypeList.length > 0)">
+                INNER JOIN
                 (
                 SELECT * FROM ta_building_project_type
                 <trim prefix="where" prefixOverrides="and | or">
@@ -110,20 +110,20 @@
                     <if test="priceList != null">
                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                             (
-                                <if test="priceArr[0] != null and priceArr[0] > 0">
+                                <if test='priceArr[0] != null and priceArr[0] != ""'>
                                     <![CDATA[ price >= ${priceArr[0]}  ]]>
                                 </if>
-                                <if test="priceArr.length > 1 and priceArr[0] != null">
+                                <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
                                     AND
                                 </if>
-                                <if test="priceArr[1] != null and priceArr[1] > 0">
+                                <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
                                     <![CDATA[ price <= ${priceArr[1]}  ]]>
                                 </if>
                             )
                         </foreach>
                     </if>
 
-                    <if test="buildingTypeList != null">
+                    <if test="buildingTypeList != null and buildingTypeList.length > 0">
                         AND building_type_id in
                         <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">
                             #{buildingType}
@@ -135,28 +135,28 @@
                 AS tbpt ON tb.building_id = tbpt.building_id
             </if>
 
-            <if test="areaList != null or houseTypeList != null">
-                LEFT JOIN
+            <if test="(areaList != null and areaList.size > 0) or (houseTypeList != null and houseTypeList.length > 0)">
+                INNER JOIN
                 (
                 SELECT * FROM ta_building_apartment
                 <trim prefix="where" prefixOverrides="and | or">
                     <if test="areaList != null">
                         <foreach collection="areaList" item="areaArr" open="(" close=")" separator=" OR ">
                             (
-                                <if test="areaArr[0] != null and areaArr[0] > 0">
+                                <if test='areaArr[0] != null and areaArr[0] != ""'>
                                     <![CDATA[ building_area >= ${areaArr[0]}  ]]>
                                 </if>
-                                <if test="areaArr.length > 1 and areaArr[0] != null">
+                                <if test='areaArr.length > 1 and areaArr[0] != null and areaArr[0] != ""'>
                                     AND
                                 </if>
-                                <if test="areaArr[1] != null and areaArr[1] > 0">
+                                <if test='areaArr.length > 1 and areaArr[1] != null and areaArr[1] != ""'>
                                     <![CDATA[ building_area <= ${areaArr[1]}  ]]>
                                 </if>
                             )
                         </foreach>
                     </if>
 
-                    <if test="houseTypeList != null">
+                    <if test="houseTypeList != null and houseTypeList.length > 0">
                         AND house_type in
                         <foreach collection="houseTypeList" item="houseType" open="(" close=")" separator=",">
                             #{houseType}