diff --git a/src/_components/Header/index.js b/src/_components/Header/index.js
index 9216f79..663dafe 100644
--- a/src/_components/Header/index.js
+++ b/src/_components/Header/index.js
@@ -5,7 +5,7 @@ import { configConstants } from "../../_constants";
export default function Header({ icon, title, subtitles = [] }) {
const authentication = useSelector((state) => state.authentication);
- const fullName = authentication?.user?.role==="organization_admin"?`Hiệu trưởng ${authentication?.user?.fullname}`:authentication?.user?.fullname
+ const fullName = authentication?.user?.role==="organization_admin"?`Hiệu trưởng ${authentication?.user?.organization_name}`:authentication?.user?.fullname
return (
diff --git a/src/_screens/criteria/criteria-manage/index.js b/src/_screens/criteria/criteria-manage/index.js
index 50594fc..fe2c19c 100644
--- a/src/_screens/criteria/criteria-manage/index.js
+++ b/src/_screens/criteria/criteria-manage/index.js
@@ -334,9 +334,9 @@ export default function CriteriaManage() {
}
addParam('school_name', searchText);
- const endPoint = `/report/api_report/getOrganizationAndCriteria${
- queryParams.length ? `?${queryParams.join("&")}` : ""
- }&limit=${limitOnline}&offset=${offsetOnlineMore}`;
+ const endPoint = `/report/api_report/getOrganizationAndCriteria?limit=${limitOnline}&offset=${offsetOnlineMore}${
+ queryParams.length ? `&${queryParams.join("&")}` : ""
+ }`;
const res = await apiCaller(endPoint, "GET");
if (res?.status) {
diff --git a/src/_screens/home/admin/index.js b/src/_screens/home/admin/index.js
index 2d3f71d..78f16c1 100644
--- a/src/_screens/home/admin/index.js
+++ b/src/_screens/home/admin/index.js
@@ -283,9 +283,10 @@ export default function AdminHome() {
if(!!searchTextSchool){
queryParams.push(`name_school_find=${searchTextSchool}`)
}
- const endPoint = `/api_organization/get_organization${
- queryParams.length ? `?${queryParams.join("&")}` : ""
- }&limit=${limitOnline}&offset=${offsetOnlineMore}`;
+ const endPoint = `/api_organization/get_organization?limit=${limitOnline}&offset=${offsetOnlineMore}
+ ${
+ queryParams.length ? `&${queryParams.join("&")}` : ""
+ }`;
const res = await apiCaller(endPoint, "GET");
if (res?.status) {