diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 13207bb4..2e0f3bb2 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -163,30 +163,32 @@ const EmployeeList = () => { className="dataTables_length text-start" id="DataTables_Table_0_length" > - + diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx index a0e9ea3e..1f5fd1e5 100644 --- a/src/pages/project/ProjectList.jsx +++ b/src/pages/project/ProjectList.jsx @@ -176,10 +176,13 @@ const ProjectList = () => {loading &&

Loading...

} - {currentItems && - currentItems.map((item) => ( - - ))} + {Array.isArray(currentItems) && loginUser?.projects && ( + currentItems + .filter((item) => loginUser.projects.includes(String(item.id))) + .map((item) => ( + + )) +)} {/* Pagination */} {!loading && (