Merge branch 'adiDev' into develop
This commit is contained in:
commit
2128857d10
1 changed files with 60 additions and 20 deletions
|
|
@ -2585,58 +2585,78 @@ export class PositionController extends Controller {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgRootId: body.nodeId,
|
orgRootId: body.nodeId,
|
||||||
orgChild1Id: IsNull(),
|
orgChild1Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 1) {
|
} else if (body.node === 1) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild1Id: body.nodeId,
|
orgChild1Id: body.nodeId,
|
||||||
orgChild2Id: IsNull(),
|
orgChild2Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 2) {
|
} else if (body.node === 2) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild2Id: body.nodeId,
|
orgChild2Id: body.nodeId,
|
||||||
orgChild3Id: IsNull(),
|
orgChild3Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 3) {
|
} else if (body.node === 3) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild3Id: body.nodeId,
|
orgChild3Id: body.nodeId,
|
||||||
orgChild4Id: IsNull(),
|
orgChild4Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 4) {
|
} else if (body.node === 4) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild4Id: body.nodeId,
|
orgChild4Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (body.node === 0) {
|
if (body.node === 0) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgRootId: body.nodeId,
|
orgRootId: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 1) {
|
} else if (body.node === 1) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild1Id: body.nodeId,
|
orgChild1Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 2) {
|
} else if (body.node === 2) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild2Id: body.nodeId,
|
orgChild2Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 3) {
|
} else if (body.node === 3) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild3Id: body.nodeId,
|
orgChild3Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 4) {
|
} else if (body.node === 4) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild4Id: body.nodeId,
|
orgChild4Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ? IsNull() : Not(IsNull()),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2818,58 +2838,78 @@ export class PositionController extends Controller {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgRootId: body.nodeId,
|
orgRootId: body.nodeId,
|
||||||
orgChild1Id: IsNull(),
|
orgChild1Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 1) {
|
} else if (body.node === 1) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild1Id: body.nodeId,
|
orgChild1Id: body.nodeId,
|
||||||
orgChild2Id: IsNull(),
|
orgChild2Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 2) {
|
} else if (body.node === 2) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild2Id: body.nodeId,
|
orgChild2Id: body.nodeId,
|
||||||
orgChild3Id: IsNull(),
|
orgChild3Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 3) {
|
} else if (body.node === 3) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild3Id: body.nodeId,
|
orgChild3Id: body.nodeId,
|
||||||
orgChild4Id: IsNull(),
|
orgChild4Id: IsNull(),
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 4) {
|
} else if (body.node === 4) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild4Id: body.nodeId,
|
orgChild4Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (body.node === 0) {
|
if (body.node === 0) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgRootId: body.nodeId,
|
orgRootId: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 1) {
|
} else if (body.node === 1) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild1Id: body.nodeId,
|
orgChild1Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 2) {
|
} else if (body.node === 2) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild2Id: body.nodeId,
|
orgChild2Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 3) {
|
} else if (body.node === 3) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild3Id: body.nodeId,
|
orgChild3Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
} else if (body.node === 4) {
|
} else if (body.node === 4) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
orgChild4Id: body.nodeId,
|
orgChild4Id: body.nodeId,
|
||||||
current_holderId: body.isBlank == true ?? IsNull(),
|
|
||||||
};
|
};
|
||||||
|
if (body.isBlank == true) {
|
||||||
|
typeCondition.current_holderId = IsNull();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue