ปรับโครงสร้าง root
This commit is contained in:
parent
9de005c7ae
commit
7f21756928
5 changed files with 143 additions and 60 deletions
|
|
@ -122,28 +122,30 @@ export class OrgChild1Controller {
|
|||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. orgChild1Rank");
|
||||
}
|
||||
|
||||
const chkCode = await this.child1Repository.findOne({
|
||||
where: {
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1Code: requestBody.orgChild1Code,
|
||||
},
|
||||
});
|
||||
if (chkCode != null) {
|
||||
throw new HttpError(
|
||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
||||
"รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว",
|
||||
);
|
||||
}
|
||||
const chkShort = await this.child1Repository.findOne({
|
||||
where: {
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1ShortName: requestBody.orgChild1ShortName,
|
||||
},
|
||||
});
|
||||
if (chkShort != null) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "อักษรย่อนี้มีอยู่ในระบบแล้ว");
|
||||
if (rootIdExits.orgRootRankSub != "DISTRICT") {
|
||||
const chkCode = await this.child1Repository.findOne({
|
||||
where: {
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1Code: requestBody.orgChild1Code,
|
||||
},
|
||||
});
|
||||
if (chkCode != null) {
|
||||
throw new HttpError(
|
||||
HttpStatusCode.INTERNAL_SERVER_ERROR,
|
||||
"รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว",
|
||||
);
|
||||
}
|
||||
const chkShort = await this.child1Repository.findOne({
|
||||
where: {
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1ShortName: requestBody.orgChild1ShortName,
|
||||
},
|
||||
});
|
||||
if (chkShort != null) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "อักษรย่อนี้มีอยู่ในระบบแล้ว");
|
||||
}
|
||||
}
|
||||
|
||||
// if (requestBody.orgChild1Code == rootIdExits.orgRootCode) {
|
||||
|
|
@ -220,27 +222,30 @@ export class OrgChild1Controller {
|
|||
if (!child1) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found.");
|
||||
}
|
||||
const chkCode = await this.child1Repository.findOne({
|
||||
where: {
|
||||
id: Not(id),
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1Code: requestBody.orgChild1Code,
|
||||
},
|
||||
});
|
||||
if (chkCode != null) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว");
|
||||
}
|
||||
const chkShort = await this.child1Repository.findOne({
|
||||
where: {
|
||||
id: Not(id),
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1ShortName: requestBody.orgChild1ShortName,
|
||||
},
|
||||
});
|
||||
if (chkShort != null) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "อักษรย่อนี้มีอยู่ในระบบแล้ว");
|
||||
|
||||
if (rootIdExits.orgRootRankSub != "DISTRICT") {
|
||||
const chkCode = await this.child1Repository.findOne({
|
||||
where: {
|
||||
id: Not(id),
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1Code: requestBody.orgChild1Code,
|
||||
},
|
||||
});
|
||||
if (chkCode != null) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว");
|
||||
}
|
||||
const chkShort = await this.child1Repository.findOne({
|
||||
where: {
|
||||
id: Not(id),
|
||||
orgRevisionId: rootIdExits.orgRevisionId,
|
||||
orgRootId: requestBody.orgRootId,
|
||||
orgChild1ShortName: requestBody.orgChild1ShortName,
|
||||
},
|
||||
});
|
||||
if (chkShort != null) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "อักษรย่อนี้มีอยู่ในระบบแล้ว");
|
||||
}
|
||||
}
|
||||
|
||||
// if(requestBody.orgChild1Code == rootIdExits.orgRootCode){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue