From 17f6e640a6b06abec655af339d28fa7375d2f42b Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Wed, 9 Jul 2025 15:29:36 +0900
Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"feat:=20DatePicker=20zIndex=20pro?=
 =?UTF-8?q?ps=20=EB=8B=A4=EC=8B=9C=20=EC=A0=81=EC=9A=A9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4224375b3a5aa1e3213b96ccfc3fff067a9ce06a.
---
 packages/common/components/src/ui/date-picker/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/common/components/src/ui/date-picker/index.tsx b/packages/common/components/src/ui/date-picker/index.tsx
index 85c584e5f..67265df0e 100644
--- a/packages/common/components/src/ui/date-picker/index.tsx
+++ b/packages/common/components/src/ui/date-picker/index.tsx
@@ -40,8 +40,10 @@ export function DatePicker({
         </Button>
       </PopoverTrigger>
       <PopoverContent
-        className="w-auto p-0"
-        style={{ zIndex: zIndex || 'auto' }}
+        className={cn(
+          "w-auto p-0",
+          zIndex ? `z-[${zIndex}]` : "" // zIndex가 있으면 적용, 없으면 기본값
+        )}
       >
         <Calendar classNames={{ cell: "rounded-md" }} {...props} />
       </PopoverContent>

From b3a69bf2ef34331c10436669de505fa9e7caf4b6 Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Wed, 9 Jul 2025 15:29:57 +0900
Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"feat:=20DatePicker=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20zIndex=20props=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 52a5650ca593c82790d8d34d5f38293797f41739.
---
 .../components/src/ui/date-picker/index.tsx      | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/common/components/src/ui/date-picker/index.tsx b/packages/common/components/src/ui/date-picker/index.tsx
index 67265df0e..ee5d37872 100644
--- a/packages/common/components/src/ui/date-picker/index.tsx
+++ b/packages/common/components/src/ui/date-picker/index.tsx
@@ -2,7 +2,7 @@ import "./date-picker.css";
 
 import { format } from "date-fns";
 import { CalendarIcon } from "lucide-react";
-import type { DayPicker } from "react-day-picker";
+import type { DayPickerSingleProps } from "react-day-picker";
 
 import { cn } from "../../lib/utils";
 import { Button } from "../button";
@@ -12,15 +12,12 @@ import { Popover, PopoverContent, PopoverTrigger } from "../popover";
 type DatePickerProps = {
   placeholder?: string;
   disabled?: boolean;
-  selected?: Date;
-  zIndex?: number; // z-index prop 추가
-} & React.ComponentProps<typeof DayPicker>;
+} & DayPickerSingleProps;
 
 export function DatePicker({
   className,
   placeholder = "날짜 선택",
   disabled,
-  zIndex, // zIndex prop 받기
   ...props
 }: DatePickerProps) {
   return (
@@ -39,13 +36,8 @@ export function DatePicker({
           )}
         </Button>
       </PopoverTrigger>
-      <PopoverContent
-        className={cn(
-          "w-auto p-0",
-          zIndex ? `z-[${zIndex}]` : "" // zIndex가 있으면 적용, 없으면 기본값
-        )}
-      >
-        <Calendar classNames={{ cell: "rounded-md" }} {...props} />
+      <PopoverContent className="w-auto p-0">
+        <Calendar initialFocus classNames={{ cell: "rounded-md" }} {...props} />
       </PopoverContent>
     </Popover>
   );

From f4d6b3415ba34f9e3dc245e462479c5400702618 Mon Sep 17 00:00:00 2001
From: JIeunhuh <entks301@naver.com>
Date: Wed, 9 Jul 2025 17:41:15 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=A4=91=EC=88=98=EB=8F=84=EC=8B=9C?=
 =?UTF-8?q?=EC=84=A4=20=EC=A1=B0=EA=B1=B4=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/common/business_components/src/ui/map/Gis.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index bad4d313c..3a7bec1b8 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -89,11 +89,11 @@ function Gis({
 			const layerName = layerNmRef.current
 			if (layerName === '하수재이용시설') {
 				featureId = data.searchPk;
-			  } else if (layerName === '빗물이용시설') {
+			  } else if (layerName === '빗물이용시설'|| layerName == '중수도시설') {
 				featureId = data.bdstInfoPk;
 			  } else if (layerName === '하수처리시설') {
 				featureId = data.bscFctCd;
-			  } else if (layerName === '중수도시설' || layerName == '온배수시설') {
+			  } else if (layerName === '온배수시설' ) {
 				featureId = data.bdstRuseFcltPk;
 			  } else {
 				console.warn('해당 레이어에 대한 featureId 매핑 없음', layerNm);