From f018acaeb5e16805b1daf8c7a735042c325a1d8b Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 10 Nov 2025 16:59:58 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=B8=EC=8A=B9=EC=9D=B8=20=EC=9E=90?= =?UTF-8?q?=EB=A3=8C=EC=97=90=20=EB=8C=80=ED=95=B4=20=EC=8A=B9=EC=9D=B8?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=B7=A8=EC=86=8C=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/rent/web/Rent02Controller.java | 5 +++-- .../resources/sql/mapper/fims/rent/lsctAprv-mapper.xml | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java b/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java index ebbd049e..47bfae40 100644 --- a/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java +++ b/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java @@ -806,8 +806,9 @@ public class Rent02Controller extends ApplicationController { return rtnMsg; } // 임대차계약 승인 정보의 변경 승인 상태(CHG_APRV_STTS_CD)가 '요청'이 아니라면 종료.. - if (!lsctAprvInfo.string("CHG_APRV_STTS_CD").equals("RQ")) { - rtnMsg = "[F] 작업 중 임대차계약 승인 요청 정보의 승인상태가 '요청' 이 아닙니다."; + if (!lsctAprvInfo.string("CHG_APRV_STTS_CD").equals("RQ") + && !lsctAprvInfo.string("CHG_APRV_STTS_CD").equals("UA")) { + rtnMsg = "[F] 작업 중 임대차계약 승인 요청 정보의 승인상태가 '요청' 또는 '미승인' 이 아닙니다."; return rtnMsg; } diff --git a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml index f7b9ca6e..3df99f33 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml @@ -415,18 +415,20 @@ , DEL_DT = , DLTR = #{modifiedBy} , DEL_RSN = #{delRsn} + WHERE LSCT_MPNG_ID != '9999999999' + AND CHG_APRV_STTS_CD IN ('RQ','UA') + AND DEL_YN = 'N' - WHERE APRV_ID IN ( + AND APRV_ID IN ( #{aprvId} ) - WHERE APRV_ID = #{aprvId} + AND APRV_ID = #{aprvId} - AND CHG_APRV_STTS_CD = 'RQ' - AND DEL_YN = 'N' +