考场排序修改

themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java

@@ -403,13 +403,16 @@ public class SysController {
         if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name())) {
             examInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getUserId, tbUser.getId());
         }
+        examInvigilateUserQueryWrapper.lambda().last(" order by CAST(room_name AS UNSIGNED) ");
         List<TBExamInvigilateUser> tbExamInvigilateUserList = tbExamInvigilateUserService
                 .list(examInvigilateUserQueryWrapper);
         Set<String> roomCodeSet = null;
         if (Objects.nonNull(tbExamInvigilateUserList) && tbExamInvigilateUserList.size() > 0) {
-            Map<String, TBExamInvigilateUser> tbExamInvigilateUserMap = tbExamInvigilateUserList.stream().collect(
-                    Collectors.toMap(TBExamInvigilateUser::getRoomCode, Function.identity(), (dto1, dto2) -> dto1));
-            roomCodeSet = new HashSet<>();
+            Map<String, TBExamInvigilateUser> tbExamInvigilateUserMap = new LinkedHashMap<>();
+            tbExamInvigilateUserList.forEach(e -> {
+                tbExamInvigilateUserMap.put(e.getRoomCode(), e);
+            });
+            roomCodeSet = new LinkedHashSet<>();
             tbExamInvigilateUserList.clear();
             Set<String> finalRoomCodeSet = roomCodeSet;
             List<TBExamInvigilateUser> finalTbExamInvigilateUserList = tbExamInvigilateUserList;