diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index a711881..ff46c32 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -150,10 +150,13 @@ export default () => { updateOrderofpayment = await updateOp(division) if (updateOrderofpayment) { - postTransaction() postPops(division, application) - setApprovedApplication(application) - setApproved(true) + + if (checkPops()) { + postTransaction() + setApprovedApplication(application) + setApproved(true) + } } } else if (division === 'occupancy') { const additionalResult = await getApi('check-bldgadditional-approval', application) @@ -173,10 +176,13 @@ export default () => { updateOrderofpayment = await updateOp(division) if (updateOrderofpayment) { - postTransaction() postPops(division, application) - setApprovedApplication(application) - setApproved(true) + + if (checkPops()){ + postTransaction() + setApprovedApplication(application) + setApproved(true) + } } } } @@ -194,8 +200,6 @@ export default () => { } } - - const updateOp = async (division: string) => { if (division === 'electrical') { return await postApi('update-opapproved-electrical', { data: parseInt(applicationId().toString()) }) @@ -233,6 +237,13 @@ export default () => { } } + const checkPops = async (application string) => { + const response = await getApi('check-popsrecord', application) + const result = response.result[0] + + return result > 0 + } + // const calculateAmounts = () => { // const amounts: string[] = amountList() // let gflguList: number[] = []