From 49a2a8d1c4fd13c8f155071865a6c3e0addd7497 Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 27 Jan 2026 11:42:55 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?=EA=B1=B4=EC=84=A4=ED=98=84=EC=9E=A5=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=8B=9C=20=EC=82=AC=EC=97=85=EB=AA=85=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 본인의 사업명인데도 불구하고 중복되었다고 나오는 버그를 수정함 " --- .../projectList/ProjectListController.java | 2 +- .../views/drilling/input/drilling_input.jsp | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/geoinfo/regi/projectList/ProjectListController.java b/src/main/java/geoinfo/regi/projectList/ProjectListController.java index 666f15bc..40c2d4f2 100644 --- a/src/main/java/geoinfo/regi/projectList/ProjectListController.java +++ b/src/main/java/geoinfo/regi/projectList/ProjectListController.java @@ -112,7 +112,7 @@ public class ProjectListController { os.write(jsonObject.toString().getBytes("UTF-8")); // UTF-8 인코딩하여 출력 } - return null; // @ResponseBody이므로 반환 값은 필요 없습니다. + return null; } // 지반정보등록 diff --git a/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp b/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp index 217a0ccf..99006af8 100644 --- a/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp @@ -232,7 +232,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe 사업명 - + @@ -360,7 +360,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe for (var i = 0; i < tableDataElements.length; i++) { let duplChkEle = tableDataElements[i].querySelector('.input-box[id*="const-name"]') // 엑셀양식 로드시 사업명 중복 체크해야 하는 대상 엘리먼트 - let result = projNmDuplChkResult(duplChkEle) + let result = projNmDuplChkResult(duplChkEle, getProjectCodeForDuplicateCheck()) if (result.result == 'false') { duplChkEle.focus(); shakeAndHighlight(duplChkEle, result.msg) @@ -649,7 +649,6 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe // 사업명 var constNameEle = document.getElementById('const-name-' + (index)); if (constNameEle) { - //duplicateCheckProjectName(constNameEle); if( constNameEle.value === "" ) { shakeAndHighlight(constNameEle, "사업명을 입력하세요." ); return false; @@ -899,7 +898,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe 사업명 - + @@ -956,6 +955,19 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe function removeRow(idx) { $('div[data-index='+ idx +']').remove(); } + + function duplicateCheckProjectNameLocal(projectNameInput) { + duplicateCheckProjectName( projectNameInput, getProjectCodeForDuplicateCheck() ); + } + + //특정 프로젝트와 연결되어 있는지 확인하여 projectCode를 넣는다. + function getProjectCodeForDuplicateCheck() { + if( orgConstUsr ) { + return orgPrjCd; + } + return null; + } +