x

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -884,10 +884,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
         switch (orderBy) {
             case "price-asc":
-                orderBy = "tb.price ASC";
+                orderBy = "tbpt.start_price ASC";
                 break;
             case "price-desc":
-                orderBy = "tb.price DESC";
+                orderBy = "tbpt.end_price DESC";
                 break;
             case "openingDate-asc":
                 orderBy = "tb.opening_date ASC";

src/main/resources/mapper/TaBuildingMapper.xml

@@ -147,54 +147,12 @@
                 </if>
             ) as tb
 
-            <if test="(priceList != null and priceList.size > 0) or (buildingTypeList != null and buildingTypeList.length > 0)">
-                INNER JOIN
+                left JOIN
                 (
                 SELECT * FROM ta_building_project_type
-                <trim prefix="where" prefixOverrides="and | or">
-
-                    <if test="priceList != null">
-                        <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>
-
-                    <if test="priceType != null and priceType != ''">
-                        and price_type = #{priceType}
-                    </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
-            </if>
 
             <if test="(areaList != null and areaList.size > 0) or (houseTypeList != null and houseTypeList.length > 0)">
                 INNER JOIN
@@ -227,7 +185,46 @@
                 GROUP BY building_id
                 ) as tba ON tb.building_id = tba.building_id
             </if>
-            WHERE tb.org_id = #{orgId}
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="priceList != null">
+                <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
+                    (
+                    <if test='priceArr[0] != null and priceArr[0] != ""'>
+                        <![CDATA[ tbpt.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[ tbpt.start_price <= ${priceArr[1]}  ]]>
+                    </if>
+                    )  or
+                    (
+                    <if test='priceArr[0] != null and priceArr[0] != ""'>
+                        <![CDATA[ tbpt.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[ tbpt.end_price <= ${priceArr[1]}  ]]>
+                    </if>
+                    )
+                </foreach>
+            </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=",">
+                    #{buildingType}
+                </foreach>
+            </if>
+        </trim>
             ORDER BY ${orderBy}
     </select>