fix
This commit is contained in:
parent
53e7badead
commit
65a8c757d7
3 changed files with 13 additions and 4 deletions
|
|
@ -1236,7 +1236,11 @@ export class PositionController extends Controller {
|
||||||
@Request() request: RequestWithUser,
|
@Request() request: RequestWithUser,
|
||||||
) {
|
) {
|
||||||
await new permission().PermissionUpdate(request, "SYS_ORG");
|
await new permission().PermissionUpdate(request, "SYS_ORG");
|
||||||
const posMaster = await this.posMasterRepository.findOne({ where: { id: id } });
|
const posMaster = await this.posMasterRepository.findOne({
|
||||||
|
relations: ["positions"],
|
||||||
|
where: { id: id }
|
||||||
|
}
|
||||||
|
);
|
||||||
if (!posMaster) {
|
if (!posMaster) {
|
||||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลอัตรากำลัง");
|
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลอัตรากำลัง");
|
||||||
}
|
}
|
||||||
|
|
@ -1399,6 +1403,11 @@ export class PositionController extends Controller {
|
||||||
match.positionIsSelected = x.positionIsSelected??false;
|
match.positionIsSelected = x.positionIsSelected??false;
|
||||||
return match
|
return match
|
||||||
}else{
|
}else{
|
||||||
|
x.id = x.id ?? undefined;
|
||||||
|
x.posMasterId = posMaster.id;
|
||||||
|
x.positionName = x.posDictName;
|
||||||
|
x.positionField = x.posDictField;
|
||||||
|
x.posExecutiveId = x.posExecutiveId || null
|
||||||
x.createdUserId = request.user.sub;
|
x.createdUserId = request.user.sub;
|
||||||
x.createdFullName = request.user.name;
|
x.createdFullName = request.user.name;
|
||||||
x.lastUpdateUserId = request.user.sub;
|
x.lastUpdateUserId = request.user.sub;
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,9 @@ export class PosDict extends EntityBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreatePosDict {
|
export class CreatePosDict {
|
||||||
|
@Column()
|
||||||
|
id?: string | null;
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
posDictName: string | null;
|
posDictName: string | null;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -266,9 +266,6 @@ export class PosMaster extends EntityBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class CreatePosMaster {
|
export class CreatePosMaster {
|
||||||
@Column()
|
|
||||||
id: string | null;
|
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
posMasterNoPrefix: string | null;
|
posMasterNoPrefix: string | null;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue