From c1bee232596e3e622d899bda568cf57988f1a6ab Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 11 Aug 2023 09:12:37 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8=EC=8B=9C?=
 =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=20=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8?=
 =?UTF-8?q?=EB=90=9C=20=EC=9E=90=EB=A3=8C=EA=B0=80=20=EC=9E=88=EC=9D=84=20?=
 =?UTF-8?q?=EB=95=8C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/excl/service/bean/Excl01ServiceBean.java |  6 ------
 .../java/cokr/xit/fims/excl/web/Excl01Controller.java |  6 ++++++
 .../webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp   | 11 ++++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
index f94b609c..77153ac7 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
@@ -48,12 +48,6 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
 		DataObject levyExcl = excl01Bean.getLevyExclInfo(req);
 
 		// 등록으로 실행했는데 부과제외 ID가 존재한다면 이미 등록되었으므로 오류로 처리..
-		if (req.getLevyExclId() == null) {
-			if (!levyExcl.string("LEVY_EXCL_ID").equals("")) {
-				// 예외를 발생시켜서 오류메세지를 보낸다..
-				throw new RuntimeException("등록된 부과제외 정보가 있습니다.");
-			}
-		}
 
 		return levyExcl;
 	}
diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
index 4ea72740..cc301da2 100644
--- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
+++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java
@@ -81,6 +81,12 @@ public class Excl01Controller extends ApplicationController {
 	public ModelAndView getLevyExclInfo(Excl01Query req) {
 		DataObject levyExclInfo = excl01Service.getLevyExclInfo(req);
 
+		if(req.getLevyExclId() == null && !levyExclInfo.string("LEVY_EXCL_ID").equals("")) {
+			ModelAndView mav = new ModelAndView("jsonView");
+			mav.addObject("message","등록된 부과제외 정보가 있습니다.");
+			return mav;
+		}
+
 		boolean json = jsonResponse();
 
 		ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl01020-info");
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 50fac226..753a343a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -471,7 +471,7 @@ $(document).ready(function(){
 		switch ($P.currentDisplay) {
 			case "photoInspection":
 				$P.photoInspectionControl.query = $P.getParams();
-			    $P.photoInspectionControl.load(0);
+			    $P.photoInspectionControl.load(1);
 				break;
 			case "sameVehicleInspection":
 				$P.sameVehicleControl.main.query = $P.getParams();
@@ -604,11 +604,16 @@ $(document).ready(function(){
 
 		ajax.get({
 			url : wctx.url("/excl/excl01/020/info.do"),
-			data : params || {},
+			data : params,
 			success : resp => {
 				
+				if((typeof resp) != "string"){
+					dialog.alert(resp.message);
+					return;
+				}
+				
 				dialog.open({
-					id : "levyExcldialog--${pageName}",
+					id : "levyExcldialog",
 					title : "부과제외 정보",
 					content : resp,
 					size : "lg",