Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -123,6 +123,7 @@
             u.biz_org_code bizOrgCode,
             u.parent_id parentId,
             u.person_status personStatus,
+            u.rec_date recDate,
             (select biz_org_name from cb_org_usr where sequence_nbr = u.parent_id) as companyName,
             (SELECT IFNULL(SUM(IF(aqr.SOURCE = 'patrol', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = u.sequence_nbr  ) as 'patrol',
             (SELECT IFNULL(SUM(IF(aqr.SOURCE != 'patrol', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = u.sequence_nbr  ) as 'other',
@@ -215,7 +216,7 @@
 
                 </foreach>
             </if>
-            order by  CONVERT(a.companyName USING gbk) ASC, a.personStatus DESC
+            order by  CONVERT(a.companyName USING gbk) ASC, a.personStatus DESC, a.recDate DESC
             LIMIT #{map.pageNum}, #{map.pageSize}
     </select>