From 23178562b2370aab3252ab73ae58e693ea341d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 12 Aug 2024 23:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/shipinquan/ShipinquanDao.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
index 5db12ea..20cb132 100644
--- a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
+++ b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
@@ -37,24 +37,21 @@
             if(c.id is null,0,1) as sfdz
         FROM bl_shipinquan a
         left join artificer b on a.create_by = b.user_id
-        left join bl_shipinquan_dianzan c on a.id = c.shipinquan_id <if test="params.userId!=null and params.userId!=''">and c.create_by = #{params.userId}</if>
+        left join bl_shipinquan_dianzan c on a.id = c.shipinquan_id
+            <if test="params.userId!=null and params.userId!=''">and c.create_by = #{params.userId}</if>
         left join collect_artificer d on b.artificer_id = d.artificer_id
+            <if test="params.userId!=null and params.userId!=''">and d.user_id = #{params.userId}</if>
         <where>
-            <if test="params.userId!=null and params.userId!=''">
-                and d.user_id = #{params.userId}
-            </if>
             <if test="params.createBy!=null and params.createBy!=''">
                 and a.create_by = #{params.createBy}
             </if>
         </where>
-
         <if test="params.longitude!=null and params.longitude!='' and params.latitude!=null and params.latitude!=''">
             order by (st_distance (point (b.longitude, b.latitude),point(#{params.longitude},#{params.longitude}) ) *111195) asc,create_time desc
         </if>
         <if test="params.longitude==null or params.longitude=='' or params.latitude==null or params.latitude==''">
             order by create_time desc
         </if>
-
     </select>
 
 </mapper>
\ No newline at end of file