定点、到站回收订单业务功能开发v6

nxhs-service/src/main/resources/mapper/RecycleStationMapper.xml

@@ -13,9 +13,15 @@
             ) AS distance
         FROM
             nx_enterprise_recycle_station a
-        ${ew.customSqlSegment}
+        WHERE
-          AND a.latitude IS NOT NULL
+          a.latitude IS NOT NULL
           AND a.longitude IS NOT NULL
+            <if test="ew != null">
+                <if test="ew.nonEmptyOfWhere">
+                    AND
+                </if>
+                ${ew.sqlSegment}
+            </if>
         HAVING
             distance &lt;= a.accept_range
         ORDER BY

nxhs-service/src/main/resources/mapper/RecycleStationPriceMapper.xml

@@ -11,7 +11,12 @@
                 LEFT JOIN nx_price_recycle b ON a.id = b.price_id
         WHERE
             b.recycle_id = #{stationId}
-            and ${ew.sqlSegment}
+            <if test="ew != null">
+                <if test="ew.nonEmptyOfWhere">
+                    AND
+                </if>
+                ${ew.sqlSegment}
+            </if>
         ORDER BY
             a.f_creator_time DESC
             LIMIT 1;