From ab606ad65d266dfe2cc89645d4de82991e9fe8c7 Mon Sep 17 00:00:00 2001
From: bicochan <chanii8@naver.com>
Date: Fri, 11 Jul 2025 17:39:17 +0900
Subject: [PATCH] =?UTF-8?q?[apps/cs]=20fix:=20=EB=8B=B4=EB=8B=B9=EC=9E=90?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=20(CS=5FUT0?=
 =?UTF-8?q?1020108)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/cs/src/pages/menu/lib/utils.ts           |  1 +
 .../menu/ui/organization-search-dialog.tsx    | 58 ++++++++++++++-----
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/apps/cs/src/pages/menu/lib/utils.ts b/apps/cs/src/pages/menu/lib/utils.ts
index 0e219047d..a5cb921a6 100644
--- a/apps/cs/src/pages/menu/lib/utils.ts
+++ b/apps/cs/src/pages/menu/lib/utils.ts
@@ -153,6 +153,7 @@ export const filterUserOrganizationTreeDataByKeyword = (
 ): NodeModel<TreeUserOrganization | TreeUser>[] => {
   return Array.from(
     treeData.reduce((matchedNodes, node) => {
+      if (node.data && "ognzSn" in node.data) return matchedNodes; // 조직 노드는 필터링 제외
       if (!node.text.includes(keyword)) return matchedNodes;
 
       matchedNodes.add(node);
diff --git a/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx b/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx
index 19e3fcf87..eb942fe11 100644
--- a/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx
+++ b/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx
@@ -12,7 +12,9 @@ import {
 import {
   Button,
   Dialog,
+  DialogClose,
   DialogContent,
+  DialogFooter,
   DialogHeader,
   DialogTitle,
   DialogTrigger,
@@ -52,10 +54,22 @@ function OrganizationSearchDialog({
   });
 
   const handleSelectNode = (node: NodeModel<TreeModel>) => {
+    if (node.data && "ognzSn" in node.data) return;
     setSelectedNode(node);
     handleUserSelect(node.data as TreeUser);
   };
 
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setTree(filterUserOrganizationTreeDataByKeyword(treeData ?? [], keyword));
+  };
+
+  const handleReset = () => {
+    setKeyword("");
+    setTree(treeData ?? []);
+  };
+
   useEffect(() => {
     setTree(treeData ?? []);
   }, [treeData]);
@@ -73,21 +87,25 @@ function OrganizationSearchDialog({
           <DialogTitle>담당자 조회</DialogTitle>
         </DialogHeader>
         <div className="flex flex-col gap-4">
-          <div className="card card-border !m-0 flex w-full items-center gap-2">
-            <Input
-              className="h-[2.5rem] !text-[1.3rem]"
-              value={keyword}
-              onChange={(e) => setKeyword(e.target.value)}
-            />
-            <Button
-              size="sm"
-              onClick={() =>
-                setTree(filterUserOrganizationTreeDataByKeyword(tree, keyword))
-              }
-            >
-              <i className="diveicon di-search text-base" />
-              조회
-            </Button>
+          <div className="card card-border !m-0 w-full">
+            <form onSubmit={handleSubmit} className="flex items-center gap-2">
+              <Input
+                className="h-[2.5rem] !text-[1.3rem]"
+                value={keyword}
+                onChange={(e) => setKeyword(e.target.value)}
+              />
+              <Button type="submit" size="sm">
+                조회
+              </Button>
+              <Button
+                type="button"
+                size="sm"
+                color="white"
+                onClick={handleReset}
+              >
+                초기화
+              </Button>
+            </form>
           </div>
           <div className="h-[36rem] overflow-auto">
             <DndProvider backend={MultiBackend} options={getBackendOptions()}>
@@ -116,6 +134,16 @@ function OrganizationSearchDialog({
             </DndProvider>
           </div>
         </div>
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button color="white" onClick={() => setSelectedNode(null)}>
+              취소
+            </Button>
+          </DialogClose>
+          <DialogClose asChild>
+            <Button disabled={!selectedNode}>확인</Button>
+          </DialogClose>
+        </DialogFooter>
       </DialogContent>
     </Dialog>
   );