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 AND R.DICT_ID = #{dto.dictId} @@ -33,7 +33,7 @@ AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%') - ORDER BY F.SORT,AB.SORT,F.SORT NULLS LAST + ORDER BY F.SORT NULLS LAST,F.SORT,AB.SORT