From 43c6be51c7c88dd94c5b5e3dbff0cbacf2d52987 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 19 Jul 2024 16:23:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
index 0de120c669..46a4e11c86 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
@@ -34,9 +34,9 @@
 			c.mobile,
 			s.`name` AS salesCompany
 		FROM
-			as_customer_vehicle AS v
-				LEFT JOIN anrui_crm.crm_customer_temp AS c ON v.customerSid = c.sid
-				LEFT JOIN anrui_portal.sys_organization AS s ON c.createOrgSid = s.sid
+		anrui_crm.crm_customer_temp AS c
+		LEFT JOIN as_customer_vehicle AS v ON c.sid = v.customerSid
+		LEFT JOIN anrui_portal.sys_organization AS s ON c.createOrgSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

From 5a3933083fd48f08a52b8d6da83eb252b76072e5 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 19 Jul 2024 16:59:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8E=A5=E5=8F=A31.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml      | 4 ++--
 .../as/biz/ascustomervehicle/AsCustomerVehicleService.java    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
index 46a4e11c86..55dfd0e16d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
@@ -34,8 +34,8 @@
 			c.mobile,
 			s.`name` AS salesCompany
 		FROM
-		anrui_crm.crm_customer_temp AS c
-		LEFT JOIN as_customer_vehicle AS v ON c.sid = v.customerSid
+		as_customer_vehicle AS v
+		LEFT JOIN anrui_crm.crm_customer_temp AS c ON v.customerSid =  c.sid
 		LEFT JOIN anrui_portal.sys_organization AS s ON c.createOrgSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
index f0847ba7f2..09e86ebbde 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
@@ -231,6 +231,7 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("v.vinNo", query.getVinNo());
         }
+        qw.orderByDesc("v.id");
         IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
         IPage<AsCustomerCrmVehVo> pagging = baseMapper.customerList(page, qw);
         PagerVo<AsCustomerCrmVehVo> p = PagerUtil.pageToVo(pagging, null);