Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Sinopec-Anxin

src/app/pages/login/login.component.ts

@@ -137,7 +137,7 @@ export class LoginComponent implements OnInit {
         sessionStorage.setItem("encryptedAccessToken", data.result.encryptedAccessToken);
         this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe(async (data: any) => {
           console.log('GetCurrentLoginInformations', data.result)
-          if (data.result.user.menus.length == 0 && data.result.user.userName != "admin") {
+          if (data.result.user.menus.length == 0) {
             this.message.create('error', `当前用户未分配菜单`);
             this.isLoading = false
             return
@@ -163,43 +163,40 @@ export class LoginComponent implements OnInit {
           this.rememberInfo()
           //自动登录
           this.autoLogin()
-          if (data.result.user.userName == 'admin') {
-            sessionStorage.setItem("isGasStation", 'false');
-            this.router.navigate(['/system/organization'])
+
+          if (data.result.user.organization.isGasStation) {
+            sessionStorage.setItem("isGasStation", 'true');
+            let a = sessionStorage.getItem('userdataOfgasstation')
+            let menuList = this.returnLastMenus(a, this.menu2)
+            let isTrue = menuList.find((item) => {
+              return item.name == "今日预警"
+            });
+            if (isTrue) {
+              this.router.navigate(['/todaywarning/petrolStation'])
+              sessionStorage.setItem('selectedMenu', '今日预警')
+            } else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
+              this.router.navigate([menuList[1].url])
+              sessionStorage.setItem('selectedMenu', menuList[1].name)
+            } else {
+              this.router.navigate([menuList[0].url])
+              sessionStorage.setItem('selectedMenu', menuList[0].name)
+            }
           } else {
-            if (data.result.user.organization.isGasStation) {
-              sessionStorage.setItem("isGasStation", 'true');
-              let a = sessionStorage.getItem('userdataOfgasstation')
-              let menuList = this.returnLastMenus(a, this.menu2)
-              let isTrue = menuList.find((item) => {
-                return item.name == "今日预警"
-              });
-              if (isTrue) {
-                this.router.navigate(['/todaywarning/petrolStation'])
-                sessionStorage.setItem('selectedMenu', '今日预警')
-              } else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
-                this.router.navigate([menuList[1].url])
-                sessionStorage.setItem('selectedMenu', menuList[1].name)
-              } else {
-                this.router.navigate([menuList[0].url])
-                sessionStorage.setItem('selectedMenu', menuList[0].name)
-              }
+            sessionStorage.setItem("isGasStation", 'false');
+            let a = sessionStorage.getItem('userdata')
+            let menuList = this.returnLastMenus(a, this.menu1)
+            let isTrue = menuList.find((item) => {
+              return item.name == "首页"
+            });
+            if (isTrue) {
+              this.router.navigate(['/homepage'])
+              sessionStorage.setItem('selectedMenu', '首页')
             } else {
-              sessionStorage.setItem("isGasStation", 'false');
-              let a = sessionStorage.getItem('userdata')
-              let menuList = this.returnLastMenus(a, this.menu1)
-              let isTrue = menuList.find((item) => {
-                return item.name == "首页"
-              });
-              if (isTrue) {
-                this.router.navigate(['/homepage'])
-                sessionStorage.setItem('selectedMenu', '首页')
-              } else {
-                this.router.navigate([menuList[0].url])
-                sessionStorage.setItem('selectedMenu', menuList[0].name)
-              }
-              // 
+              this.router.navigate([menuList[0].url])
+              sessionStorage.setItem('selectedMenu', menuList[0].name)
             }
+            // 
+
           }
           this.message.create('success', `登录成功`);
         }, err => {