From 9cf79f44cccf0b6ed174d6ff1de8c7b2c8b0fc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Fri, 7 Feb 2025 11:13:41 +0900
Subject: [PATCH 1/2] =?UTF-8?q?getQueryString=20=EA=B0=92=EC=9D=B4=20null?=
 =?UTF-8?q?=20=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EB=B9=88=20=EA=B0=92?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/common-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/common-utils.js b/src/util/common-utils.js
index ee003ec3..842eace0 100644
--- a/src/util/common-utils.js
+++ b/src/util/common-utils.js
@@ -130,7 +130,7 @@ export const calculateFlowDirection = (canvasAngle) => {
  */
 export const getQueryString = (o) => {
   const queryString = Object.keys(o)
-    .map((key) => `${key}=${o[key]}`)
+    .map((key) => `${key}=${o[key] ?? ''}`)
     .join('&')
   return `?${queryString}`
 }

From b6d50ec63a6283b95f68126b6782ee13b11bb6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Fri, 7 Feb 2025 11:14:22 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=20=EC=B2=B4=ED=81=AC=20=EB=B0=8F=20=EC=A0=9C=ED=92=88?=
 =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=20=20validation=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../step/PowerConditionalSelect.jsx           | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
index 715d3884..349c69dc 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
@@ -92,12 +92,29 @@ export default function PowerConditionalSelect(props) {
   }
 
   const onCheckSeries = (data) => {
-    const copySeries = series.map((s) => {
-      return {
-        ...s,
-        selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected,
-      }
-    })
+    let copySeries = []
+    if (data.pcsMkrMultiType === 'MULTI') {
+      copySeries = series.map((s) => {
+        return {
+          ...s,
+          selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected,
+        }
+      })
+    } else if (data.pcsMkrMultiType === 'SINGLE-P') {
+      copySeries = series.map((s) => {
+        return {
+          ...s,
+          selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.pcsMkrMultiType === 'MULTI' ? s.selected : false,
+        }
+      })
+    } else {
+      copySeries = series.map((s) => {
+        return {
+          ...s,
+          selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : false,
+        }
+      })
+    }
     setSeries(copySeries)
     handleSetmodels(copySeries.filter((s) => s.selected))
   }
@@ -147,7 +164,11 @@ export default function PowerConditionalSelect(props) {
 
       return
     }
-    setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
+    if (selectedMaker.pcsMkrMultiType === 'MULTI') {
+      setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
+    } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) {
+      setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
+    }
     setSelectedRow(null)
   }
 
@@ -160,8 +181,6 @@ export default function PowerConditionalSelect(props) {
       setModels([])
       setSelectedModels([])
       setSelectedMaker(option)
-      console.log('option', option)
-      getUseModuleItemList
       const param = {
         pcsMkrCd: option.pcsMkrCd,
         mixMatlNo: getUseModuleItemList()[0].mixMatlNo,