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

src/pages/userCenter/userManage/RelateRoleModal.jsx

@@ -17,6 +17,7 @@ const RelateRoleModal = props => {
     multiRelateRoles,
     onCancel,
     onSelect,
+    submitSearchUser,
     loading,
   } = props;
   const { TabPane } = Tabs;
@@ -81,8 +82,10 @@ const RelateRoleModal = props => {
       .then(res => {
         if (res.code === 0) {
           onCancel();
-          // 跳转到组织
-          onSelect([currentSelectOrg]);
+          // 跳转到组织重新请求改机构下用户数据,查找用户时currentSelectOrg为空数组，不需要重新请求
+          if(currentSelectOrg.length!==0) {
+            onSelect([currentSelectOrg]);
+          };
           notification.success({
             message: '提交成功',
             duration: 2,