Skip to content

C
CivManage
Commit adb59167 authored by Maofei94's avatar Maofei94
Browse files
Options

Merge branch 'master' of g.civnet.cn:ReactWeb5/maintenance

parents cf241883 6c464d43
Pipeline #22166 passed with stages
        in 19 minutes 4 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 4 additions and 1 deletion
        src/pages/userCenter/userManage/RelateRoleModal.jsx
        View file @ adb59167
        ...@@ -17,6 +17,7 @@ const RelateRoleModal = props => { ...@@ -17,6 +17,7 @@ const RelateRoleModal = props => {
        multiRelateRoles, multiRelateRoles,
        onCancel, onCancel,
        onSelect, onSelect,
        submitSearchUser,
        loading, loading,
        } = props; } = props;
        const { TabPane } = Tabs; const { TabPane } = Tabs;
        ...@@ -81,8 +82,10 @@ const RelateRoleModal = props => { ...@@ -81,8 +82,10 @@ const RelateRoleModal = props => {
        .then(res => { .then(res => {
        if (res.code === 0) { if (res.code === 0) {
        onCancel(); onCancel();
        // 跳转到组织 // 跳转到组织重新请求改机构下用户数据,查找用户时currentSelectOrg为空数组，不需要重新请求
        if(currentSelectOrg.length!==0) {
        onSelect([currentSelectOrg]); onSelect([currentSelectOrg]);
        };
        notification.success({ notification.success({
        message: '提交成功', message: '提交成功',
        duration: 2, duration: 2,
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment