From 8a7798c69f0bc12d237c4a1960e7a0abc9882b9a Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 17 Nov 2025 16:24:10 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?=ED=95=9C=EA=B5=AD=EC=B2=A0=EB=8F=84=EA=B3=B5=EC=82=AC=20Korail?= =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C=20=EB=A1=9C=EA=B3=A0?= =?UTF-8?q?=20=EC=95=88=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../input/service/impl/DrillingInputServiceImpl.java | 10 +++++++++- .../WEB-INF/views/drilling/home/drilling_index.jsp | 8 ++++---- src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp | 2 +- src/main/webapp/js/map/main/map.js | 6 +++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java index 687e6816..81690c5a 100644 --- a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java +++ b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java @@ -142,6 +142,10 @@ public class DrillingInputServiceImpl implements DrillingInputService { Long lCid = MyUtil.getLongFromObject( params.get("CID") ); if( lCid == null ) { tbl = drillingInputMapper.getItemByProjectCode( params ); + if( tbl == null ) { + // 발주기관 프로젝트 아님 + return params; + } params.put("CID", tbl.get("cid")); } else { tbl = drillingInputMapper.getItemByCid( params ); @@ -187,7 +191,11 @@ public class DrillingInputServiceImpl implements DrillingInputService { Long lCid = MyUtil.getLongFromObject( params.get("CID") ); if( lCid == null ) { tbl = drillingInputMapper.getItemByProjectCode( params ); - params.put("CID", tbl.get("cid")); + if( tbl != null ) { + params.put("CID", tbl.get("cid")); + } else { + return params; + } } else { tbl = drillingInputMapper.getItemByCid( params ); } diff --git a/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp b/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp index ed078c2c..133ddd5e 100644 --- a/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp @@ -157,7 +157,7 @@
- +

국가철도공단

@@ -180,7 +180,7 @@
- +
@@ -414,8 +414,8 @@ diff --git a/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp b/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp index c6a3c189..60e67329 100644 --- a/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp +++ b/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp @@ -1372,7 +1372,7 @@ function table3display(){ }
-
+
지도구분
diff --git a/src/main/webapp/js/map/main/map.js b/src/main/webapp/js/map/main/map.js index 95cc01f9..5a9b1d0c 100644 --- a/src/main/webapp/js/map/main/map.js +++ b/src/main/webapp/js/map/main/map.js @@ -209,8 +209,8 @@ function hole_layerOnOff() { function forceUncheckHoleLayerOnOff() { //33 글자여야한다. //var returnValue = "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY"; - if( false ) { - var returnValue = "YNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY"; + if( true ) { + var returnValue = "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY"; for (i = 1; i <= 33; i++) { var char = returnValue.charAt(i); if( char==='Y') { @@ -317,7 +317,7 @@ var VWORLD_URL = "https://xdworld.vworld.kr/2d/Base/service/${z}/${x}/${y}.png // TBL_HEADER_HOLE 설정 // ------------------------------ var T_HOLE = "TBL_HEADER_HOLE"; -var T_WEB_STEEP_SLOPE = "WEB_STEEP_SLOPE"; // 급경사지 +var T_WEB_STEEP_SLOPE = "WEB_STEEP_SLOPE"; var T_HOLE_M = "TBL_HEADER_HOLE_M"; var F_PROJECT_CODE = "PROJECT_CODE";