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

2025-12-29 18:00:37 +08:00 · 2025-12-29 18:00:37 +08:00 · 9da2de5340
parent 9d51754605 297bee4a1d
commit 9da2de5340
1 changed files with 4 additions and 1 deletions
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@ -335,7 +335,10 @@
            AND u.employment_flag = #{params.eqEmploymentFlag}
        </if>

-        ORDER BY
+        ORDER BY CASE
+        WHEN u.employment_flag IN ('10', '11') THEN 1
+        ELSE 2
+        END ASC,
        u.sort ASC, u.create_time DESC