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

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