Merge branch 'adiDev' into develop
This commit is contained in:
commit
e9e2fb5fd6
1 changed files with 2 additions and 2 deletions
|
|
@ -789,7 +789,7 @@ export class PositionController extends Controller {
|
||||||
|
|
||||||
let shortName = "";
|
let shortName = "";
|
||||||
|
|
||||||
if (body.isAll === true) {
|
// if (body.isAll === true) {
|
||||||
if (
|
if (
|
||||||
posMaster.orgRootId !== null &&
|
posMaster.orgRootId !== null &&
|
||||||
posMaster.orgChild1Id == null &&
|
posMaster.orgChild1Id == null &&
|
||||||
|
|
@ -831,7 +831,7 @@ export class PositionController extends Controller {
|
||||||
body.type = 4;
|
body.type = 4;
|
||||||
shortName = posMaster.orgChild4.orgChild4ShortName;
|
shortName = posMaster.orgChild4.orgChild4ShortName;
|
||||||
}
|
}
|
||||||
}
|
// }
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: posMaster.id,
|
id: posMaster.id,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue