合并冲突
Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8
diff --git a/src/pages/System/User/index.tsx b/src/pages/System/User/index.tsx
index 6435787..5042208 100644
--- a/src/pages/System/User/index.tsx
+++ b/src/pages/System/User/index.tsx
@@ -1,4 +1,3 @@
-
import React, { useState, useRef, useEffect } from 'react';
import { useIntl, FormattedMessage, useAccess } from '@umijs/max';
import { Card, Col, Dropdown, FormInstance, Row, Space, Switch } from 'antd';
@@ -257,7 +256,7 @@
icon=<EditOutlined />
hidden={!access.hasPerms('system:user:edit')}
onClick={async () => {
- fetchUserInfo(record.userId);
+ await fetchUserInfo(record.userId);
const treeData = await getDeptTree({});
setDeptTree(treeData);
setModalVisible(true);
@@ -283,7 +282,7 @@
const success = await handleRemoveOne(record);
if (success) {
if (actionRef.current) {
- actionRef.current.reload();
+ actionRef.current?.reload();
}
}
},
@@ -499,7 +498,7 @@
setModalVisible(false);
setCurrentRow(undefined);
if (actionRef.current) {
- actionRef.current.reload();
+ actionRef.current?.reload();
}
}
}}