Merge branch 'develop' into warunee-dev

This commit is contained in:
Warunee Tamkoo 2023-07-17 08:59:04 +07:00
commit 6fa564de69

View file

@ -75,7 +75,7 @@ const loadTreeData = async () => {
};
function filterByPersonIdNull(obj: any) {
if (obj.name === null) {
if (obj.name === null && obj.isCondition != true) {
return true;
}
if (obj.children && obj.children.length > 0) {