Fix email can't login

src/main/java/com/attendenceSystem/security/CustomUserDetailsService.java

@@ -20,7 +20,7 @@ public class CustomUserDetailsService implements UserDetailsService {
         public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
 
                 User user = userRepository
-                                .findByUsername(username)
+                                .findByUsernameOrEmail(username, username)
                                 .orElseThrow(() -> new UsernameNotFoundException("Không tìm thấy User"));
 
                 return CustomUserDetails.fromUser(user);

src/main/resources/static/css/account/account-list.css

@@ -381,4 +381,76 @@ tbody tr:hover {
     .icon-btn {
         width: 100%;
     }
-}
+}
+
+/* ===================================
+   PAGINATION (đồng bộ với các trang khác)
+=================================== */
+
+.pagination {
+    padding: 20px 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 12px;
+    flex-wrap: wrap;
+}
+
+.btn-pagination {
+    min-width: 120px;
+    height: 44px;
+    padding: 0 18px;
+    border: none;
+    border-radius: 12px;
+    cursor: pointer;
+    font-weight: 600;
+    color: white;
+    background: linear-gradient(to right, var(--indigo-06), var(--purple));
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    text-decoration: none;
+    transition: .25s;
+}
+
+.btn-pagination:hover {
+    transform: translateY(-2px);
+}
+
+.page-info {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    color: var(--text-light);
+    font-size: .95rem;
+}
+
+.page-link {
+    width: 40px;
+    height: 40px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 10px;
+    text-decoration: none;
+    font-weight: 600;
+    font-size: .95rem;
+    color: var(--text-light);
+    transition: .25s;
+}
+
+.page-link:hover {
+    background: var(--shadow-box);
+    color: white;
+}
+
+.page-link.active {
+    background: linear-gradient(to right, var(--indigo-06), var(--purple));
+    color: white;
+}
+
+@media(max-width:768px) {
+    .pagination {
+        flex-direction: column;
+    }
+}

src/main/resources/templates/cms/account/account-list.html

@@ -84,6 +84,28 @@
 
                         </tbody>
                     </table>
+
+                    <!-- PAGINATION -->
+                    <div class="pagination" th:if="${users.totalPages > 1}">
+                        <a th:if="${users.hasPrevious()}"
+                           th:href="@{/admin/accounts(page=${users.number - 1})}"
+                           class="btn btn-pagination">← Trước</a>
+
+                        <span class="page-info">
+                            <a th:each="i : ${#numbers.sequence(0, users.totalPages - 1)}"
+                               th:if="${i == users.number}"
+                               th:href="@{/admin/accounts(page=${i})}"
+                               class="page-link active" th:text="${i + 1}">1</a>
+                            <a th:each="i : ${#numbers.sequence(0, users.totalPages - 1)}"
+                               th:unless="${i == users.number}"
+                               th:href="@{/admin/accounts(page=${i})}"
+                               class="page-link" th:text="${i + 1}">1</a>
+                        </span>
+
+                        <a th:if="${users.hasNext()}"
+                           th:href="@{/admin/accounts(page=${users.number + 1})}"
+                           class="btn btn-pagination">Sau →</a>
+                    </div>
                 </section>
             </main>
             <!-- FOOTER -->

src/main/resources/templates/cms/account/employee-list.html

@@ -55,7 +55,6 @@
                             <span>Tất cả phòng</span>
                             <strong>0</strong>
                         </button>
-
                         <button class="room-chip" type="button" th:each="dept : ${departments}"
                             th:attr="data-room=${dept.name()}">
                             <span th:text="${dept.displayName}"></span>
@@ -193,7 +192,7 @@
                     <div class="room-code-box">
                         <span>Mã tham gia</span>
 
-                            <h1 id="roomCode">--------</h1>
+                        <h1 id="roomCode">--------</h1>
 
                         <button id="copyBtn">
                             Sao chép mã
@@ -217,7 +216,7 @@
         window.serverRoomCodes = {};
 
         /*[# th:each="dept : ${T(com.attendenceSystem.module.user.entity.enums.Department).values()}"]*/
-        window.serverRoomCodes[ /*[[${ dept.roomCode }]]*/ 'dummy_room' ] = /*[[${ dept.joinCode }]]*/ 'dummy_code';
+        window.serverRoomCodes[ /*[[${ dept.roomCode }]]*/ 'dummy_room'] = /*[[${ dept.joinCode }]]*/ 'dummy_code';
         /*[/]*/
     </script>
     <script>