Merge branch 'develop' into adiDev

This commit is contained in:
AdisakKanthawilang 2024-01-30 16:03:54 +07:00
commit f5c5d21a3e

View file

@ -97,14 +97,25 @@ export class PositionController extends Controller {
select: [
"id",
"posTypeName",
"posTypeRank",
"posLevels"
]
"posTypeRank"
],
relations: ["posLevels"],
});
if (!posType) {
return new HttpSuccess([]);
}
return new HttpSuccess(posType);
const mapPosType = posType.map(item => ({
id: item.id,
posTypeName: item.posTypeName,
posTypeRank: item.posTypeRank,
posLevels: item.posLevels.map((posLevel) => ({
id: posLevel.id,
posLevelName: posLevel.posLevelName,
posLevelRank: posLevel.posLevelRank,
posLevelAuthority: posLevel.posLevelAuthority
}))
}));
return new HttpSuccess(mapPosType);
} catch (error) {
return error;
}
@ -123,13 +134,11 @@ export class PositionController extends Controller {
posLevelName: "นักบริหาร",
posLevelRank: 1,
posLevelAuthority: "HEAD",
posTypes: [
{
id: "00000000-0000-0000-0000-000000000000",
posTypeName: "นักบริหาร",
posTypeRank: 1
}
]
posTypes: {
id: "00000000-0000-0000-0000-000000000000",
posTypeName: "นักบริหาร",
posTypeRank: 1
}
},
])
async GetPosLevel() {
@ -152,13 +161,11 @@ export class PositionController extends Controller {
posLevelName: item.posLevelName,
posLevelRank: item.posLevelRank,
posLevelAuthority: item.posLevelAuthority,
posTypes: [
{
id: item.posType.id,
posTypeName: item.posType.posTypeName,
posTypeRank: item.posType.posTypeRank,
}
]
posTypes: {
id: item.posType.id,
posTypeName: item.posType.posTypeName,
posTypeRank: item.posType.posTypeRank,
}
}));
return new HttpSuccess(mapPosLevel);
} catch (error) {