no message
This commit is contained in:
parent
f23fd05c2a
commit
1a6c8826be
1 changed files with 5 additions and 2 deletions
|
|
@ -242,7 +242,10 @@ export class PermissionOrgController extends Controller {
|
||||||
if (!_permissionOrg) {
|
if (!_permissionOrg) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสิทธิ์โครงสร้างนี้");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสิทธิ์โครงสร้างนี้");
|
||||||
}
|
}
|
||||||
profiles = await _permissionOrg.permissionOrgRoots.map((x) => x.profileTree.id);
|
profiles = await _permissionOrg.permissionOrgRoots.map((x) => x.profileId);
|
||||||
|
} else {
|
||||||
|
const _permissionOrg = await this.permissionOrgRepository.find();
|
||||||
|
profiles = await _permissionOrg.map((x) => x.profileId);
|
||||||
}
|
}
|
||||||
|
|
||||||
let queryLike =
|
let queryLike =
|
||||||
|
|
@ -275,7 +278,7 @@ export class PermissionOrgController extends Controller {
|
||||||
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
|
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
|
||||||
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
|
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
|
||||||
.andWhere(`profile.id IN (:...profiles)`, {
|
.andWhere(`profile.id IN (:...profiles)`, {
|
||||||
profiles: profiles == null ? [] : profiles,
|
profiles: profiles == null || profiles.length == 0 ? ["null"] : profiles,
|
||||||
})
|
})
|
||||||
.andWhere(
|
.andWhere(
|
||||||
requestBody.searchKeyword != undefined &&
|
requestBody.searchKeyword != undefined &&
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue