From 74a07ffe56c7d3e94325a2a23f5a5a0358eaaa44 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 21 Oct 2022 09:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=8E=A5=E5=8F=A3=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/item/ItemDao.xml        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index ad69cad50..fe74a0858 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -2464,8 +2464,11 @@
             a.id id,
             a.item_content itemContent,
             a.issue_latitude latitude,
-            a.issue_longitude longitude,
-            round((st_distance_sphere(point(#{longitude}, #{latitude}), point(a.ISSUE_LONGITUDE, a.ISSUE_LATITUDE))) / 1000 ,1) as km
+            a.issue_longitude longitude
+            <if test="longitude != null and longitude != '' and latitude != null and latitude != ''">
+                ,
+                round((st_distance_sphere(point(#{longitude}, #{latitude}), point(a.ISSUE_LONGITUDE, a.ISSUE_LATITUDE))) / 1000 ,1) as km
+            </if>
         FROM
             epdc_item a
         INNER JOIN (
@@ -2491,7 +2494,9 @@
         <if test="statDate != null and statDate != ''">
             AND DATE_FORMAT(a.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
         </if>
-        HAVING km <![CDATA[ <= ]]> 10
+        <if test="longitude != null and longitude != '' and latitude != null and latitude != ''">
+            HAVING km <![CDATA[ <= ]]> 10
+        </if>
         ORDER BY
             a.created_time DESC,
             a.all_dept_ids ASC