.

src/app.jsx

@@ -19,8 +19,12 @@ export async function getInitialState() {
   const fetchUserInfo = async () => {
     try {
       return await queryCurrentUser();
-    } catch (error) {
-      history.push(loginPath);
+    } catch (error) {      
+      if (history.location.pathname == '/user/orgLogin') {
+        history.push('/user/orgLogin')
+      }else{
+        history.push(loginPath);
+      }
     }
 
     return undefined;

src/components/RightContent/AvatarDropdown.jsx

@@ -17,11 +17,17 @@ const loginOut = async (val) => {
   if (window.location.pathname !== '/user/login' && !redirect) {
     if (val == 'org') {
       history.replace({
-        pathname: '/user/orgLogin',        
+        pathname: '/user/orgLogin',
+        search: stringify({
+          redirect: pathname,
+        }),      
       });
     } else {
       history.replace({
         pathname: '/user/login',
+        search: stringify({
+          redirect: pathname,
+        }),
       });
     }
   }