chamomind/jws-backend
chamomind/jws-backend
6
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

fix: active only does not detect if head is not active

Browse source
This commit is contained in:
Methapon2001 2024-12-06 16:37:56 +07:00
parent 3f04f3c727
commit 76ea340fe5
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/01-branch-controller.ts
View file

@ -253,7 +253,12 @@ export class BranchController extends Controller {
) { ) {
const where = { const where = {
AND: { AND: {
...filterStatus(status), ...filterStatus(activeOnly ? Status.ACTIVE : status),
AND: activeOnly
? {
OR: [{ headOffice: { status: { not: Status.INACTIVE } } }, { headOffice: null }],
}
: undefined,
headOfficeId: headOfficeId ?? (filter === "head" || tree ? null : undefined), headOfficeId: headOfficeId ?? (filter === "head" || tree ? null : undefined),
NOT: { headOfficeId: filter === "sub" && !headOfficeId ? null : undefined }, NOT: { headOfficeId: filter === "sub" && !headOfficeId ? null : undefined },
OR: permissionCond(req.user, { alwaysIncludeHead: withHead, activeOnly }), OR: permissionCond(req.user, { alwaysIncludeHead: withHead, activeOnly }),