Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev

src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js

@@ -119,7 +119,7 @@ function DepartmentPositionPage(props) {
       const tree = res?.data || [];
       setTreeData(tree);
       if (tree.length) {
-        setSelectedDept(toSelectedDept(tree[0]));
+        setSelectedDept(tree[0]);
       }
     } catch (err) {
       console.warn("[DepartmentPosition] loadTree failed:", err);
@@ -281,7 +281,7 @@ function DepartmentPositionPage(props) {
             treeData={filteredTree}
             fieldNames={{ title: "deptName", key: "id", children: "children" }}
             onSelect={(_, { node }) => {
-              setSelectedDept(toSelectedDept(node));
+              setSelectedDept(node);
             }}
           />
         </div>
@@ -383,6 +383,7 @@ function DepartmentPositionPage(props) {
       {deptModalOpen && (
         <DeptFormModal
           open={deptModalOpen}
+          selectedDept={selectedDept}
           currentId={currentId}
           selectedDeptId={selectedDept?.id}
           staffOptions={staffOptions}
@@ -462,6 +463,7 @@ function DeptFormModal({
   currentId,
   staffOptions,
   treeData,
+  selectedDept,
   requestAdd,
   requestEdit,
   requestDetails,
@@ -528,10 +530,12 @@ function DeptFormModal({
   };
 
   const handleSubmit = async (values) => {
+    
     try {
       setSubmitting(true);
       const request = currentId ? requestEdit : requestAdd;
-      const payload = { ...values };
+      const payload = {...selectedDept, ...values };
+      delete payload.children;
       if (currentId) {
         payload.id = currentId;
       }