From cffc2b463e3c1c5dc30d2d37aa1593f766595d9f Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 16 May 2024 22:45:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml
index b71f70c..24fc0da 100644
--- a/src/main/resources/mapper/AddressBookMapper.xml
+++ b/src/main/resources/mapper/AddressBookMapper.xml
@@ -8,12 +8,12 @@
             AB.*,F.SORT FSORT,F.ID FCID,U.ROLE,F.TYPE FTYPE,IF(O.NAME IS NULL,UD.NAME,O.NAME) ONAME,A.ADNM
         FROM
             ADDRESS_BOOK AB
+        LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId}
         LEFT JOIN ORGANIZATION O  ON AB.ORGANIZATION = O.ID
         LEFT JOIN UNIT_DICT UD  ON AB.ORGANIZATION = UD.ID
         LEFT JOIN ADINFO A  ON AB.ADCD = A.ADCD
         LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
         LEFT JOIN USERS U ON U.AB_ID = AB.ID
-        LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId}
         WHERE 1=1
         <if test="dto.dictId != null and dto.dictId != '' ">
             AND R.DICT_ID = #{dto.dictId}
@@ -33,7 +33,7 @@
         <if test="dto.phone != null and dto.phone != '' ">
             AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%')
         </if>
-        ORDER BY F.SORT,AB.SORT,F.SORT NULLS LAST
+        ORDER BY F.SORT NULLS LAST,F.SORT,AB.SORT
     </select>