From ada22920bb42577c59bfe96ad8f7a8abc6bef040 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Sat, 30 Mar 2024 09:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=AF=BC=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/DcWarningMapper.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
index fe629ad5..9aa85077 100644
--- a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml
@@ -70,13 +70,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="export" resultType="com.zc.business.domain.DcWarning">
         SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,warning.end_time,warning.event_cause,
-               mark.longitude,mark.latitude,warning.lane,warning.vehicle_type,
+               warning.lane,warning.vehicle_type,mark.longitude,mark.latitude,
                warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
                warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
                warning.`remark`, warning.`create_time`,warning.`update_time`,
                warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
                warning.`other_config` FROM dc_warning AS warning
-              LEFT JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark
+              LEFT JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark  and warning.direction =mark.direction
         <where>
             <if test="warningSource == null  || warningSource == ''">and warning.warning_source !=6</if>
             <if test="warningSource != null  and warningSource != ''">and warning.warning_source = #{warningSource}</if>