diff --git a/src/views/thirdLogin/index.vue b/src/views/thirdLogin/index.vue
index 397d7b518..e6343cea4 100644
--- a/src/views/thirdLogin/index.vue
+++ b/src/views/thirdLogin/index.vue
@@ -3,18 +3,24 @@
     <div class="thirdLoginMessage">
       {{ message }}
     </div>
+    <org-select ref="orgSelect" @select="selectOrg" />
   </div>
 </template>
 <script>
 import { LoginParams } from '@/utils/login';
+import { getOrgList, selectOrgnization } from '@/api/login';
 import { thirdCountLogin } from '@/api/management/user';
 import md5 from 'js-md5';
 import { setToken, getToken } from '@/utils/auth';
+import OrgSelect from '../login/orgSelect';
 //  , ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList
 // import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
 
 export default {
     name:'ThirdLogin',
+    components: {
+        OrgSelect
+    },
     data() {
         return {
             message:''
@@ -52,7 +58,8 @@ export default {
                 const header = { group: '', 'X-Token': tokenKey };
                 this.$store.dispatch('setToken', tokenKey);
                 this.$store.dispatch('subscribe', {header, type:'class'});
-                this.$router.replace({path:'/trainingPlatform'});
+                // this.$router.replace({path:'/trainingPlatform'});
+                this.checkOrgnizationInfo();
             } else {
                 thirdCountLogin(model).then(resp=> {
                     const token = resp.data;
@@ -60,8 +67,7 @@ export default {
                     setToken(token);
                     this.$store.dispatch('setToken', token);
                     this.$store.dispatch('subscribe', {header, type:'class'});
-                    this.$router.replace({path:'/trainingPlatform'});
-                    // setSessionStorage('thirdLogin', true);
+                    this.checkOrgnizationInfo();
                 }).catch(() => {
                     this.message = '参数有误，请检查';
                 });
@@ -72,7 +78,35 @@ export default {
         }
     },
     methods:{
-
+        selectOrg(orgId) {
+            selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
+                this.$router.replace({path:'/trainingPlatform'});
+            }).catch(err => {
+                this.$message.error(`登入组织失败！，${err.message}`);
+            });
+        },
+        checkOrgnizationInfo() {
+            getOrgList().then(resp => {
+                const orgList = resp.data;
+                let orgId = '';
+                if (orgList.length < 2) {
+                    if (orgList.length === 1) {
+                        orgId = orgList[0].orgId;
+                        selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
+                            this.$router.replace({path:'/trainingPlatform'});
+                        }).catch(err => {
+                            this.$message.error(`登入组织失败！，${err.message}`);
+                        });
+                    } else {
+                        this.$router.replace({path:'/trainingPlatform'});
+                    }
+                } else {
+                    this.$refs.orgSelect.doShow(orgList);
+                }
+            }).catch((error)=>{
+                this.$message.error(error.message);
+            });
+        }
     }
 };
 </script>