This commit is contained in:
AdisakKanthawilang 2024-02-12 12:23:37 +07:00
parent 2bfc926f4b
commit 2809626c45

View file

@ -742,7 +742,7 @@ export class PositionController extends Controller {
relations: ["posLevel", "posType", "posExecutive"], relations: ["posLevel", "posType", "posExecutive"],
}); });
let shortName = null; let shortName = "";
if (body.isAll === true) { if (body.isAll === true) {
if ( if (
@ -1014,7 +1014,7 @@ export class PositionController extends Controller {
id: item.id, id: item.id,
orgShortName: orgShortName:
item.orgRoot == null item.orgRoot == null
? "-" ? null
: item.orgChild1 == null : item.orgChild1 == null
? item.orgRoot.orgRootShortName ? item.orgRoot.orgRootShortName
: item.orgChild2 == null : item.orgChild2 == null
@ -1024,10 +1024,10 @@ export class PositionController extends Controller {
: item.orgChild4 == null : item.orgChild4 == null
? item.orgChild3.orgChild3ShortName ? item.orgChild3.orgChild3ShortName
: item.orgChild4.orgChild4ShortName, : item.orgChild4.orgChild4ShortName,
lastUpdatedAt: item.lastUpdatedAt, lastUpdatedAt: item.lastUpdatedAt?item.posMasterNo:null,
posMasterNoPrefix: item.posMasterNoPrefix, posMasterNoPrefix: item.posMasterNoPrefix?item.posMasterNoPrefix:null,
posMasterNo: item.posMasterNo, posMasterNo: item.posMasterNo?item.posMasterNo:null,
posMasterNoSuffix: item.posMasterNoSuffix, posMasterNoSuffix: item.posMasterNoSuffix?item.posMasterNoSuffix:null,
})); }));
return new HttpSuccess(_data); return new HttpSuccess(_data);
} }