เลขที่ตำแหน่งซ้ำ

This commit is contained in:
Kittapath 2024-02-22 10:08:29 +07:00
parent b42af12a5f
commit 7eef964d48

View file

@ -413,35 +413,35 @@ export class PositionController extends Controller {
orgRoot = await this.orgRootRepository.findOne({
where: { id: requestBody.orgRootId },
});
SName = orgRoot.shortName;
SName = orgRoot.orgRootShortName;
if (!orgRoot) {
let orgChild1: any = null;
if (requestBody.orgChild1Id != null)
orgChild1 = await this.child1Repository.findOne({
where: { id: requestBody.orgChild1Id },
});
SName = orgChild1.shortName;
SName = orgChild1.orgChild1ShortName;
if (!orgChild1) {
let orgChild2: any = null;
if (requestBody.orgChild2Id != null)
orgChild2 = await this.child2Repository.findOne({
where: { id: requestBody.orgChild2Id },
});
SName = orgChild2.shortName;
SName = orgChild2.orgChild2ShortName;
if (!orgChild2) {
let orgChild3: any = null;
if (requestBody.orgChild3Id != null)
orgChild3 = await this.child3Repository.findOne({
where: { id: requestBody.orgChild3Id },
});
SName = orgChild3.shortName;
SName = orgChild3.orgChild3ShortName;
if (!orgChild3) {
let orgChild4: any = null;
if (requestBody.orgChild4Id != null)
orgChild4 = await this.child4Repository.findOne({
where: { id: requestBody.orgChild4Id },
});
SName = orgChild4.shortName;
SName = orgChild4.orgChild4ShortName;
if (!orgChild4) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงสร้าง");
} else {
@ -696,35 +696,35 @@ export class PositionController extends Controller {
orgRoot = await this.orgRootRepository.findOne({
where: { id: requestBody.orgRootId },
});
SName = orgRoot.shortName;
SName = orgRoot.orgRootShortName;
if (!orgRoot) {
let orgChild1: any = null;
if (requestBody.orgChild1Id != null)
orgChild1 = await this.child1Repository.findOne({
where: { id: requestBody.orgChild1Id },
});
SName = orgChild1.shortName;
SName = orgChild1.orgChild1ShortName;
if (!orgChild1) {
let orgChild2: any = null;
if (requestBody.orgChild2Id != null)
orgChild2 = await this.child2Repository.findOne({
where: { id: requestBody.orgChild2Id },
});
SName = orgChild2.shortName;
SName = orgChild2.orgChild2ShortName;
if (!orgChild2) {
let orgChild3: any = null;
if (requestBody.orgChild3Id != null)
orgChild3 = await this.child3Repository.findOne({
where: { id: requestBody.orgChild3Id },
});
SName = orgChild3.shortName;
SName = orgChild3.orgChild3ShortName;
if (!orgChild3) {
let orgChild4: any = null;
if (requestBody.orgChild4Id != null)
orgChild4 = await this.child4Repository.findOne({
where: { id: requestBody.orgChild4Id },
});
SName = orgChild4.shortName;
SName = orgChild4.orgChild4ShortName;
if (!orgChild4) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงสร้าง");
} else {
@ -758,6 +758,23 @@ export class PositionController extends Controller {
posMaster.orgRevisionId = orgRoot.orgRevisionId;
}
const chk_SName0 = await this.posMasterRepository.findOne({
where: {
orgRevisionId: posMaster.orgRevisionId,
orgRoot: { orgRootShortName: SName },
orgChild1Id: IsNull(),
posMasterNo: requestBody.posMasterNo,
id: Not(posMaster.id),
},
relations: ["orgRoot"],
});
if (chk_SName0 != null) {
throw new HttpError(
HttpStatusCode.INTERNAL_SERVER_ERROR,
"ไม่สามารถใส่เลขที่ตำแหน่งซ้ำกันได้",
);
}
const chk_SName1 = await this.posMasterRepository.findOne({
where: {
orgRevisionId: posMaster.orgRevisionId,