src/components/management/StuffSubHeader.jsx

@@ -56,20 +56,19 @@ export default function StuffSubHeader({ type }) {
    */
   const moveFloorPlan = () => {
     setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
-
     const param = {
-      pid: managementState?.planList?.length > 0 ? managementState?.planList[0].planNo : '1',
+      pid: managementState?.planList?.length === 0 ? '1' : managementState?.planList[0].planNo,
       objectNo: objectNo,
     }
 
-    if (managementState?.planList?.length > 0) {
+    if (managementState?.planList?.length === 0) {
+      setSelectedMenu('surface')
+    } else {
       if (managementState?.planList[0].estimateDate) {
         setSelectedMenu('module')
       } else {
         setSelectedMenu('surface')
       }
-    } else {
-      setSelectedMenu('surface')
     }
 
     const url = `/floor-plan?${queryStringFormatter(param)}`

src/hooks/roofcover/useRoofAllocationSetting.js

@@ -314,8 +314,7 @@ export function useRoofAllocationSetting(id) {
     setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
     drawDirectionArrow(currentObject)
     modifyModuleSelectionData()
-    // closeAll()
-    closePopup(id)
+    closeAll()
     basicSettingSave()
     setModuleSelectionData({ ...moduleSelectionData, roofConstructions: newRoofList })
   }