From ac60358c11ed106c8359343a4e715fabcb87d839 Mon Sep 17 00:00:00 2001
From: Xusan <1105644308@QQ.COM>
Date: Wed, 15 May 2024 17:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/AddressBookMapper.xml  | 5 +----
 src/main/resources/mapper/OrganizationMapper.xml | 8 ++------
 src/main/resources/mapper/UnitDictMapper.xml     | 8 ++------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml
index d7b192a..807d556 100644
--- a/src/main/resources/mapper/AddressBookMapper.xml
+++ b/src/main/resources/mapper/AddressBookMapper.xml
@@ -8,7 +8,7 @@
             AB.*,F.SORT FSORT
         FROM
             ADDRESS_BOOK AB
-        LEFT JOIN FC F ON F.AB_ID = AB.ID
+        LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId}
         LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
         WHERE 1=1
         <if test="dto.dictId != null and dto.dictId != '' ">
@@ -26,9 +26,6 @@
         <if test="dto.phone != null and dto.phone != '' ">
             AND AB.PHONE = #{dto.phone}
         </if>
-        <if test="dto.userId != null and dto.userId != ''">
-            AND F.USER_ID = #{dto.userId}
-        </if>
         ORDER BY AB.SORT
     </select>
 
diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml
index d7aff94..f98c597 100644
--- a/src/main/resources/mapper/OrganizationMapper.xml
+++ b/src/main/resources/mapper/OrganizationMapper.xml
@@ -17,12 +17,8 @@
             F.SORT FSORT
         FROM
             ORGANIZATION O
-                LEFT JOIN FC F ON F.AB_ID = O.ID
-        <where>
-            <if test="userId != null and userId != ''">
-                F.USER_ID = #{userId}
-            </if>
-        </where>
+                LEFT JOIN FC F ON F.AB_ID = O.ID AND F.USER_ID = #{userId}
+
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/UnitDictMapper.xml b/src/main/resources/mapper/UnitDictMapper.xml
index e98ec78..463a0be 100644
--- a/src/main/resources/mapper/UnitDictMapper.xml
+++ b/src/main/resources/mapper/UnitDictMapper.xml
@@ -15,12 +15,8 @@
         F.SORT FSORT
         FROM
         UNIT_DICT UD
-        LEFT JOIN FC F ON F.AB_ID = UD.O_ID
-        <where>
-            <if test="userId != null and userId != ''">
-                F.USER_ID = #{userId}
-            </if>
-        </where>
+        LEFT JOIN FC F ON F.AB_ID = UD.O_ID AND F.USER_ID = #{userId}
+
     </select>
 
 </mapper>
\ No newline at end of file