diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx index cc454348d..034be8032 100644 --- a/src/controls/dynamicForm/DynamicForm.tsx +++ b/src/controls/dynamicForm/DynamicForm.tsx @@ -260,7 +260,7 @@ export class DynamicForm extends React.Component< .map((term) => `-1#;${term.name}|${term.key};`) .join("#"); } else if (fieldType === "User") { - objects[`${columnInternalName}Id`] = val.newValue; + objects[`${columnInternalName}Id`] = val.newValue.length === 0 ? null : val.newValue; } else if (fieldType === "Choice") { objects[columnInternalName] = val.newValue.key; } else if (fieldType === "MultiChoice") { @@ -269,7 +269,7 @@ export class DynamicForm extends React.Component< objects[columnInternalName] = JSON.stringify(val.newValue); } else if (fieldType === "UserMulti") { objects[`${columnInternalName}Id`] = { - results: val.newValue.lenght === 0 ? null : val.newValue, + results: val.newValue.length === 0 ? null : val.newValue, }; } else if (fieldType === "Thumbnail") { if (additionalData) { diff --git a/src/services/SPService.ts b/src/services/SPService.ts index 6dab9f2c8..f78ee82c4 100644 --- a/src/services/SPService.ts +++ b/src/services/SPService.ts @@ -610,7 +610,11 @@ export default class SPService implements ISPService { const emails = []; result[fieldName].forEach(element => { const loginNameWithoutClaimsToken = element.Name.split("|").pop(); - emails.push(loginNameWithoutClaimsToken + "/" + element.Title); + if(!loginNameWithoutClaimsToken.toLowerCase().includes('null')){ + if(!element.Title.toLowerCase().includes('null')){ + emails.push(loginNameWithoutClaimsToken + "/" + element.Title); + } + } }); return emails; } @@ -634,11 +638,15 @@ export default class SPService implements ISPService { if (result && result[fieldName]) { const element = result[fieldName] const loginNameWithoutClaimsToken = element.Name.split("|").pop(); - return loginNameWithoutClaimsToken + "/" + element.Title; + if(!loginNameWithoutClaimsToken.toLowerCase().includes('null')){ + if(!element.Title.toLowerCase().includes('null')){ + return loginNameWithoutClaimsToken + "/" + element.Title; + } + } } } - return null; + return []; } catch (error) { console.dir(error); return Promise.reject(error);