outaozhen 3 vuotta sitten
vanhempi
commit
b6cbfcec58

+ 7 - 8
src/pages/Institutions/Company/Detail/components/OrganizationModal.tsx

@@ -152,15 +152,14 @@ const OrganizationModal: React.FC<OrganizationModalProps> = ({
       if (item.ID === delName) {
         console.log('我是ID')
       }
-      if (item.children) {
-        item.disabled = true
-        return (
-          <TreeNode {...item} disabled={item.disabled}>
-            {renderTreeNodes(item.children)}
-          </TreeNode>
-        )
+      const newItem = { ...item }
+
+      if (newItem.children) {
+        newItem.disabled = true
+        newItem.children = renderTreeNodes(newItem.children)
+        return newItem
       }
-      return <TreeNode {...item} />
+      return newItem
     })
 
   return (

+ 1 - 1
src/pages/Institutions/Staff/components/StaffDetail.tsx

@@ -136,7 +136,7 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
         }
         if (type === ModalType.PREVIEW) {
           account.institutionID = data.institution.name
-          account.organizationalStructureID = data.organizationalStructure.name
+          account.organizationalStructureID = data.organizationalStructure?.name
         }
         form.setValues({
           ...account