workflow add keycloakId
This commit is contained in:
parent
968d5f6dad
commit
87ee9b5b12
1 changed files with 5 additions and 3 deletions
|
|
@ -378,6 +378,7 @@ export class WorkflowController extends Controller {
|
||||||
can_delete: false,
|
can_delete: false,
|
||||||
can_cancel: false,
|
can_cancel: false,
|
||||||
can_sign: false,
|
can_sign: false,
|
||||||
|
keycloakId: workflow.createdUserId,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return new HttpSuccess({
|
return new HttpSuccess({
|
||||||
|
|
@ -392,6 +393,7 @@ export class WorkflowController extends Controller {
|
||||||
can_delete: operator.canDelete,
|
can_delete: operator.canDelete,
|
||||||
can_cancel: operator.canCancel,
|
can_cancel: operator.canCancel,
|
||||||
can_sign: operator.canSign,
|
can_sign: operator.canSign,
|
||||||
|
keycloakId: workflow.createdUserId,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -800,15 +802,15 @@ export class WorkflowController extends Controller {
|
||||||
keyword: string;
|
keyword: string;
|
||||||
page: number;
|
page: number;
|
||||||
pageSize: number;
|
pageSize: number;
|
||||||
profileId?: string | null;
|
keycloakId?: string | null;
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
let posMasterUser: PosMaster = new PosMaster();
|
let posMasterUser: PosMaster = new PosMaster();
|
||||||
if (body.profileId) {
|
if (body.keycloakId) {
|
||||||
posMasterUser = (await this.posMasterRepo.findOne({
|
posMasterUser = (await this.posMasterRepo.findOne({
|
||||||
where: {
|
where: {
|
||||||
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
orgRevision: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
|
||||||
current_holderId: body.profileId,
|
current_holder: { keycloak: body.keycloakId },
|
||||||
},
|
},
|
||||||
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
relations: ["current_holder", "current_holder.posType", "current_holder.posLevel"],
|
||||||
})) as PosMaster;
|
})) as PosMaster;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue