From 137b13731220832e5a1c2db8b5b6acb0d800dda9 Mon Sep 17 00:00:00 2001
From: Lixian Zhou <charlie32690@gmail.com>
Date: Tue, 10 Mar 2026 16:30:59 -0400
Subject: [PATCH] fix

---
 client/src/components/admin/Permission.js       | 4 ++--
 client/src/components/employees/EmployeeList.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/components/admin/Permission.js b/client/src/components/admin/Permission.js
index a2d929a..5c1f188 100644
--- a/client/src/components/admin/Permission.js
+++ b/client/src/components/admin/Permission.js
@@ -66,7 +66,7 @@ const Permission = () => {
                     <th>Preferred Name</th>
                     <th>Username</th>
                     <th>Status</th>
-                    <th>Roles</th>
+                    <th>Permissions</th>
                     <th></th>
                   </tr>
                 </thead>
@@ -77,7 +77,7 @@ const Permission = () => {
                       <td>{employee?.name_cn}</td>
                       <td>{employee?.username}</td>
                       <td>{employee?.status}</td>
-                      <td>{employee?.roles?.join(", ")}</td>
+                      <td>{employee?.permissions?.join(", ") || "-"}</td>
                       <td>
                         <button
                           className="btn btn-primary btn-sm me-2"
diff --git a/client/src/components/employees/EmployeeList.js b/client/src/components/employees/EmployeeList.js
index 56c1137..e45165a 100644
--- a/client/src/components/employees/EmployeeList.js
+++ b/client/src/components/employees/EmployeeList.js
@@ -57,7 +57,7 @@ const EmployeeList = () => {
                 <th>Preferred Name</th>
                 <th>Username</th>
                 <th>Status</th>
-                <th>Roles</th>
+                <th>Permissions</th>
                 <th></th>
               </tr>
               
@@ -69,7 +69,7 @@ const EmployeeList = () => {
                   <td>{employee?.name_cn}</td>
                   <td>{employee?.username}</td>
                   <td>{employee?.status}</td>
-                  <td>{employee?.roles?.join(', ')}</td>
+                  <td>{employee?.permissions?.join(', ') || '-'}</td>
                   <td>
                     {AuthService.canAddOrEditEmployees() && <button className="btn btn-primary btn-sm me-2" onClick={() => goToEdit(employee?.id)}>Edit</button> }
                     {AuthService.canViewEmployees() && <button className="btn btn-default btn-sm me-2" onClick={() => goToView(employee?.id)}>View</button>}