Merge branch 'adiDev' into develop
This commit is contained in:
commit
1a59a7078f
1 changed files with 4 additions and 1 deletions
|
|
@ -133,7 +133,10 @@ export class ProfileLeaveController extends Controller {
|
||||||
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
|
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
|
||||||
const record = await this.leaveRepo.find({
|
const record = await this.leaveRepo.find({
|
||||||
relations: { leaveType: true },
|
relations: { leaveType: true },
|
||||||
where: { profileId: profileId, status: Not("cancel") },
|
where: {
|
||||||
|
profileId: profileId,
|
||||||
|
// status: Not("cancel")
|
||||||
|
},
|
||||||
order: { createdAt: "ASC" },
|
order: { createdAt: "ASC" },
|
||||||
});
|
});
|
||||||
return new HttpSuccess(record);
|
return new HttpSuccess(record);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue