From b4417561a26ce363841ab9824ba8abd3dade7863 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 26 Apr 2021 10:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E5=AE=A2=E6=88=B7=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=E6=8C=89?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D?=
 =?UTF-8?q?=E5=BA=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerDao.xml | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index 7ef7c8261d..791a9f0aaf 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -69,6 +69,8 @@
         <if test='customerName != "" and customerName != null'>
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
+        ORDER BY
+            created_time DESC
     </select>
 
     <select id="getAllList" resultMap="customerMap">
@@ -106,19 +108,21 @@
 
     <select id="selectAllCustomerList" resultType="com.epmet.dto.result.CustomerListResultDTO">
         SELECT
-        ID AS "customerId",
-        CUSTOMER_NAME,
-        TITLE,
-        VALIDITY_TIME,
-        ORGANIZATION_LEVEL,
-        LOGO,
-        GRID_NUMBER
+            id AS "customerId",
+            customer_name,
+            title,
+            validity_time,
+            organization_level,
+            logo,
+            grid_number
         FROM customer
         WHERE
-        DEL_FLAG = '0'
+            del_flag = '0'
         <if test='customerName != "" and customerName != null'>
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
+        ORDER BY
+            created_time DESC
     </select>
 
     <select id="getExternalAndParentCustomerId" resultType="String">