Catch empty attributes in completeCollaborators
This commit is contained in:
parent
c511aebbe4
commit
297568d020
@ -261,26 +261,34 @@ export default class CollaboratorService extends AbstractService {
|
|||||||
|
|
||||||
if (process.processData.office) {
|
if (process.processData.office) {
|
||||||
const office: any = (await OfficeService.getOfficeByUid(process.processData.office.uid)).processData;
|
const office: any = (await OfficeService.getOfficeByUid(process.processData.office.uid)).processData;
|
||||||
process.processData.office = {
|
if (office) {
|
||||||
uid: office.uid,
|
process.processData.office = {
|
||||||
idNot: office.idNot,
|
uid: office.uid,
|
||||||
crpcen: office.crpcen,
|
idNot: office.idNot,
|
||||||
name: office.name,
|
crpcen: office.crpcen,
|
||||||
office_status: office.office_status
|
name: office.name,
|
||||||
};
|
office_status: office.office_status
|
||||||
|
};
|
||||||
|
|
||||||
if (progressCallback) {
|
if (progressCallback) {
|
||||||
progressiveProcess.processData.office = process.processData.office;
|
progressiveProcess.processData.office = process.processData.office;
|
||||||
progressCallback(JSON.parse(JSON.stringify(progressiveProcess)));
|
progressCallback(JSON.parse(JSON.stringify(progressiveProcess)));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.error('Office not found');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (process.processData.role) {
|
if (process.processData.role) {
|
||||||
const role: any = (await RoleService.getRoleByUid(process.processData.role.uid)).processData;
|
const role: any = (await RoleService.getRoleByUid(process.processData.role.uid)).processData;
|
||||||
process.processData.role = {
|
if (!role) {
|
||||||
uid: role.uid,
|
console.error('Role not found');
|
||||||
name: role.name
|
} else {
|
||||||
};
|
process.processData.role = {
|
||||||
|
uid: role.uid,
|
||||||
|
name: role.name
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (progressCallback) {
|
if (progressCallback) {
|
||||||
progressiveProcess.processData.role = process.processData.role;
|
progressiveProcess.processData.role = process.processData.role;
|
||||||
@ -290,16 +298,20 @@ export default class CollaboratorService extends AbstractService {
|
|||||||
|
|
||||||
if (process.processData.office_role) {
|
if (process.processData.office_role) {
|
||||||
const officeRole: any = (await OfficeRoleService.getOfficeRoleByUid(process.processData.office_role.uid)).processData;
|
const officeRole: any = (await OfficeRoleService.getOfficeRoleByUid(process.processData.office_role.uid)).processData;
|
||||||
process.processData.office_role = {
|
if (!officeRole) {
|
||||||
uid: officeRole.uid,
|
console.error('Office role not found');
|
||||||
name: officeRole.name,
|
} else {
|
||||||
rules: officeRole.rules?.map((rule: any) => {
|
process.processData.office_role = {
|
||||||
return {
|
uid: officeRole.uid,
|
||||||
uid: rule.uid,
|
name: officeRole.name,
|
||||||
name: rule.name
|
rules: officeRole.rules?.map((rule: any) => {
|
||||||
};
|
return {
|
||||||
})
|
uid: rule.uid,
|
||||||
};
|
name: rule.name
|
||||||
|
};
|
||||||
|
})
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (progressCallback) {
|
if (progressCallback) {
|
||||||
progressiveProcess.processData.office_role = process.processData.office_role;
|
progressiveProcess.processData.office_role = process.processData.office_role;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user