diff --git a/src/module/position/api/get/getAllPosition.ts b/src/module/position/api/get/getAllPosition.ts index 51c9288..4950213 100644 --- a/src/module/position/api/get/getAllPosition.ts +++ b/src/module/position/api/get/getAllPosition.ts @@ -13,13 +13,17 @@ export async function getAllPosition(req: NextRequest) { const user = await funGetUserByCookies() console.log(groupID) - // if(user.) + if (groupID == null) { + grupFix = user.idGroup + } else { + grupFix = groupID + } const positions = await prisma.position.findMany({ where: { - idGroup: String(groupID), + idGroup: String(grupFix), isActive: (active == "true" ? true : false), }, select: { diff --git a/src/module/user/api/get/getAllUser.ts b/src/module/user/api/get/getAllUser.ts index 5eaf179..4d9a7c2 100644 --- a/src/module/user/api/get/getAllUser.ts +++ b/src/module/user/api/get/getAllUser.ts @@ -20,7 +20,7 @@ export async function getAllUser(req: NextRequest) { const users = await prisma.user.findMany({ where: { isActive: active == "true" ? true : false, - idGroup: String(idGroup), + idGroup: String(fixGroup), }, select: { id: true, diff --git a/src/module/user/member/component/create_member.tsx b/src/module/user/member/component/create_member.tsx index f6b1703..148eda3 100644 --- a/src/module/user/member/component/create_member.tsx +++ b/src/module/user/member/component/create_member.tsx @@ -52,9 +52,14 @@ export default function CreateMember() { async function getAllPosition(val: any) { try { - const res = await fetch(`${API_ADDRESS.apiGetAllPosition}&groupId=${val}&active=true`) - const data = await res.json() - setListPosition(data) + if (val != null) { + const res = await fetch(`${API_ADDRESS.apiGetAllPosition}&groupId=${val}&active=true`) + const data = await res.json() + setListPosition(data) + } else { + setListPosition([]) + } + } catch (error) { console.error(error) } @@ -72,8 +77,6 @@ export default function CreateMember() { async function changeGrup(val: any) { - - console.log(val) setListPosition([]) setListData({ ...listData, @@ -183,7 +186,7 @@ export default function CreateMember() { ...listData, idPosition: val })} - value={listData.idPosition} + value={(listData.idPosition == "") ? null : listData.idPosition} />