From 7e4772db4659ed3a700ae419c7e6a025458aefca Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 8 Aug 2024 17:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B4=AA=E8=B4=A3=E4=BB=BB=E4=BA=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShAddressBookServiceImpl.java        |  3 --
 .../resources/mapper/ShAddressBookMapper.xml  | 29 +++++--------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
index 519df3c..2aadd60 100644
--- a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java
@@ -39,9 +39,6 @@ public class ShAddressBookServiceImpl extends ServiceImpl<ShAddressBookMapper, S
         return getBaseMapper().page(dto.getPage(), dto);
     }
 
-    public static void main(String[] args) {
-        System.out.println(StringUtils.deleteWhitespace(" 王 平 "));
-    }
     /**
      * 全量更新
      *
diff --git a/src/main/resources/mapper/ShAddressBookMapper.xml b/src/main/resources/mapper/ShAddressBookMapper.xml
index 158b34d..53108a1 100644
--- a/src/main/resources/mapper/ShAddressBookMapper.xml
+++ b/src/main/resources/mapper/ShAddressBookMapper.xml
@@ -43,33 +43,24 @@
         FROM
             (
             SELECT
-                T."CITY",
-                T."COUNTY",
-                T."AREA",
-                T."VILLAGE",
-                T."NAME",
-                T."PHONE"
+            MAX(T.ID) ID
             FROM
             "FXKH_TXL"."SH_ADDRESS_BOOK" T
             WHERE
-            DEL = 1
+            T.DEL = 1
             GROUP BY
             T."CITY",
             T."COUNTY",
             T."AREA",
             T."VILLAGE",
             T."NAME",
-            T."PHONE"
-            ) T1
-        LEFT JOIN "FXKH_TXL"."SH_ADDRESS_BOOK" T ON T.CITY = T1.CITY
-        AND T.COUNTY = T1.COUNTY
-        AND T.AREA = T1.AREA
-        AND T.VILLAGE = T1.VILLAGE
-        AND T.NAME = T1.NAME
-        AND T.PHONE = T1.PHONE
+            T."PHONE" ,
+            T."TYPE1" ,
+            T."TYPE2"
+        ) T1
+        LEFT JOIN "FXKH_TXL"."SH_ADDRESS_BOOK" T ON T.ID = T1.ID
         WHERE
-        1 = 1
-        AND DEL = 1
+        DEL = 1
         <if test="dto.type1 != null and dto.type1 != '' ">
             AND T.TYPE1 = #{dto.type1}
         </if>
@@ -110,10 +101,6 @@
         </if>
 
         ORDER BY
-            T.CITY NULLS FIRST,
-            T.COUNTY NULLS FIRST,
-            T.AREA NULLS FIRST,
-            T.VILLAGE NULLS FIRST,
             T.SORT ASC
 
     </select>