From 005a33d84ebdb1584ed56df3c8e4700d3a853897 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 15:37:27 +0800
Subject: [PATCH] fix check has role

---
 src/main/ui/manage.html                       |  8 +--
 src/main/ui/managev2.html                     |  4 ++
 src/main/ui/static/boot/managerMainApp.js     | 50 ++++++++++++++++++-
 src/main/ui/static/boot/managerMainAppv2.js   | 40 +++++++++------
 src/main/ui/static/config/managers/manager.js |  2 +
 .../config/managers/templates/modify.html     |  4 +-
 .../managers/templates/new_manager.html       |  6 +--
 .../templates/org_commission_root.html        |  2 +-
 src/main/ui/static/menu/managerMenu.js        | 47 ++++++++++++++++-
 src/main/ui/static/menu/templates/home.html   | 22 ++++----
 .../ui/static/menu/templates/main_menu.html   |  4 +-
 11 files changed, 148 insertions(+), 41 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 3cb91bb07..ffd0b7c2b 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -281,14 +281,14 @@ margin-bottom: 10%;"/>
 
             <ul class="sidebar-menu" data-widget="tree">
 
-                <li ui-sref-active="active" ng-if="'dashboard'|withModule">
+                <li ui-sref-active="active" ng-if="roleNow!=null && 'dashboard'|withModule">
                     <a ui-sref="dashboard">
                         <i class="fa fa-dashboard"></i>
                         <span>控制台|Dashboard</span>
                     </a>
                 </li>
 
-                <li class="treeview" ng-if="roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                <li class="treeview" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-sitemap"></i>
                         <span>商户管理|Partner Manage</span>
@@ -322,7 +322,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                <li class="treeview" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-list-alt"></i>
                         <span>交易管理|Transaction</span>
@@ -691,7 +691,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="(role=='salesmanager') || (role=='director')">
+                <li class="treeview" ng-if="(roleNow=='salesmanager') || (roleNow=='director')">
                     <a href="javascript:;">
                         <i class="fa fa-tv"></i>
                         <span>合伙人管理</span>
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index 0348332ff..4fc1108e7 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -147,6 +147,7 @@ margin-bottom: 10%;"/>
                     <b>RoyalPay</b>
                     <b>|</b>
                      <b>{{roleNow}}</b>
+
             </span>
             </a>
             <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="currentUser.org">
@@ -157,6 +158,9 @@ margin-bottom: 10%;"/>
                         ng-bind="currentUser.org.name"></b><b>|</b>
                      <b>{{roleNow}}</b></span>
             </a>
+            <select style="height: 30px;border: 0;text-align: center;text-align-last:center;" ng-model="roleName" ng-change="changeRole(roleName)">
+                <option ng-repeat="x in rolelist" value="{{x.value}}">{{x.module}}</option>
+            </select>
             <ul class="navbar-header">
                 <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
                     <a ui-sref="dashboard"  role="button">Dashboard</a>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index 94318c0bf..067b1b66e 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -202,6 +202,48 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 });
             }
 
+            function hasRole() {
+                var rolenum;
+                switch (sessionStorage.getItem('role')) {
+                    case "administrator":
+                        rolenum = 1;
+                        break;
+                    case "bduser":
+                        rolenum = 4;
+                        break;
+                    case "salesmanager":
+                        rolenum = 8192;
+                        break;
+                    case "accountant":
+                        rolenum = 8;
+                        break;
+                    case "sitemanager":
+                        rolenum = 128;
+                        break;
+                    case "director":
+                        rolenum = 64;
+                        break;
+                    case "developer":
+                        rolenum = 256;
+                        break;
+                    case "compliance":
+                        rolenum = 2;
+                        break;
+                    case "riskmanager":
+                        rolenum = 1024;
+                        break;
+                    default:
+                        break;
+                }
+                if ((window.currentUser.role & rolenum) >0) {
+                    return true;
+                }else {
+                    sessionStorage.removeItem('role');
+                    return false;
+                }
+            }
+
+
             var getRoleMenulist = function (role) {
                 var roleMenu = [];
 
@@ -238,7 +280,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 return roleMenu;
             };
             $scope.role = getRoleMenulist(window.currentUser.role);
-            sessionStorage.setItem('role',$scope.role[0].value);
+
+            if (sessionStorage.getItem('role') == null) {
+                sessionStorage.setItem('role',$scope.role[0].value);
+            }else {
+                hasRole();
+            }
+
             $scope.roleNow = sessionStorage.getItem('role');
 
             $scope.changeRole = function (index) {
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 6e85ab3cb..0b30e7962 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -6,38 +6,38 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     var app = angular.module('managerMainAppv2', ['ngSanitize', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload']);
     app.config(['$urlRouterProvider', '$httpProvider', function ($urlRouterProvider, $httpProvider) {
 
-        var getRoleMenulist = function (role) {
+         window.getRoleMenulist = function (role) {
             var roleMenu = [];
 
             if ((role & 1) >0){
-                roleMenu.push("administrator");
+                roleMenu.push({'value':'administrator','module':'系统配置'});
             }
             if ((role & 2) >0){
-                roleMenu.push("compliance");
+                roleMenu.push({'value':'compliance','module':'合规中心'});
             }
             if ((role & 4) >0){
-                roleMenu.push("bduser");
+                roleMenu.push({'value':'bduser','module':"销售中心"});
             }
             if ((role & 8) >0){
-                roleMenu.push("accountant");
+                roleMenu.push({'value':'accountant','module':"财务中心"});
             }
             if ((role & 64) >0){
-                roleMenu.push("director");
+                roleMenu.push({'value':'director','module':"领导决策"});
             }
             if ((role & 128) >0){
-                roleMenu.push("sitemanager");
+                roleMenu.push({'value':'sitemanager','module':"营销中心"});
             }
             if ((role & 256) >0){
-                roleMenu.push("developer");
+                roleMenu.push({'value':'developer','module':"开发中心"});
             }
             if ((role & 1024) >0){
-                roleMenu.push("riskmanager");
+                roleMenu.push({'value':'riskmanager','module':"风控中心"});
             }
             if ((role & 2048) >0){
-                roleMenu.push("guest");
+                roleMenu.push({'value':'guest','module':"guest"});
             }
             if ((role & 8192) >0){
-                roleMenu.push("salesmanager");
+                roleMenu.push({'value':'salesmanager','module':"销管中心"});
             }
             return roleMenu;
         };
@@ -46,8 +46,8 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
         }else {
             sessionStorage.setItem('roleNum','1');
-            sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role).valueOf());
-            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu?role=' + getRoleMenulist(window.currentUser.role).valueOf());
+            sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role)[0].value);
+            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu');
         }
 
 
@@ -61,9 +61,19 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         $httpProvider.defaults.headers.get['Cache-Control'] = 'no-cache';
         $httpProvider.defaults.headers.get['Pragma'] = 'no-cache';
     }]);
-    app.controller('managerIndexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
-        function ($scope, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
+    app.controller('managerIndexCtrl', ['$scope', '$state','$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
+        function ($scope, $state,$rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
+            $scope.rolelist = window.getRoleMenulist(window.currentUser.role);
             $scope.roleNow = getroleNow();
+            $scope.roleName = getroleNow();
+            $scope.changeRole = function (index) {
+                sessionStorage.setItem('role',index);
+                $scope.roleNow = getroleNow();
+                $state.go('listMenu',null,{
+                    reload:true
+                });
+            };
+
             if (sessionStorage.getItem('roleNum') =='N'){
                     if (window.location.hash == "" || window.location.hash == "#/home") {
                         $scope.headerDisplay = false;
diff --git a/src/main/ui/static/config/managers/manager.js b/src/main/ui/static/config/managers/manager.js
index 1ffaa3ea6..ffea729ac 100644
--- a/src/main/ui/static/config/managers/manager.js
+++ b/src/main/ui/static/config/managers/manager.js
@@ -131,6 +131,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     }]);
     app.controller('newManagerDialogCtrl', ['$scope', '$http', function ($scope, $http) {
         $scope.params = {};
+        $scope.manager = {};
         if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id){
             var params = angular.copy($scope.params);
             params.org_id = $scope.currentUser.org_id;
@@ -164,6 +165,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
                 $scope.manager.org_id = $scope.manager.org_id2;
             }
             delete $scope.manager.org_id2;
+
             $http.post('/sys/manager_accounts', $scope.manager).then(function () {
                 $scope.$close();
             }, function (resp) {
diff --git a/src/main/ui/static/config/managers/templates/modify.html b/src/main/ui/static/config/managers/templates/modify.html
index fe043378f..46b4a356a 100644
--- a/src/main/ui/static/config/managers/templates/modify.html
+++ b/src/main/ui/static/config/managers/templates/modify.html
@@ -98,9 +98,9 @@
                         <label ng-if="!manager.admin && !manager.operator">
                             <input type="checkbox" ng-model="manager.bd" name="bd">BD User
                         </label>
-                        <label ng-if="('00001'|withRole)">
+<!--                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager
-                        </label>
+                        </label>-->
                     </p>
                 </div>
               <!--  <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && !manager.sitemanager && orgs!=null">
diff --git a/src/main/ui/static/config/managers/templates/new_manager.html b/src/main/ui/static/config/managers/templates/new_manager.html
index 81d3d1d04..9c8ca94d7 100644
--- a/src/main/ui/static/config/managers/templates/new_manager.html
+++ b/src/main/ui/static/config/managers/templates/new_manager.html
@@ -107,13 +107,13 @@
                         <label ng-if="!manager.admin && !manager.operator">
                             <input type="checkbox" ng-model="manager.bd" name="bd">BD User
                         </label>
-                        <label ng-if="('00001'|withRole)">
+<!--                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.orgmanager" name="guest">Org Manager
-                        </label>
+                        </label>-->
                     </p>
                 </div>
 
-                <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && orgs != null">
+                <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && orgs != null && manager.bd">
                     <label class="control-label" for="org-select">Organization</label>
                     <select class="form-control" ng-model="manager.org_id" id="org-select"
                             ng-options="org.org_id as org.name for org in orgs"
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index 7cc5ddbe3..f9e064700 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -6,7 +6,7 @@
     </ol>
 </section>
 <div class="content">
-    <div class="box box-default">
+    <div class="box box-default" ng-if="'10000000000000'|withRole">
         <div class="box-body">
             <div class="form-inline">
                 <div class="form-group">
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 81c08d874..2088b8b93 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -3,7 +3,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     var app = angular.module('listMenuApp', ['ui.router', 'ui.bootstrap']);
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('listMenu', {
-            url: '/menu?role',
+            url: '/menu',
             controller: 'listMenuCtrl',
             templateUrl: '/static/menu/templates/main_menu.html'
         }).state('home', {
@@ -14,7 +14,50 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
 
-        $scope.role = sessionStorage.getItem('role');
+        function hasRole() {
+            var rolenum;
+            switch (sessionStorage.getItem('role')) {
+                case "administrator":
+                    rolenum = 1;
+                    break;
+                case "bduser":
+                    rolenum = 4;
+                    break;
+                case "salesmanager":
+                    rolenum = 8192;
+                    break;
+                case "accountant":
+                    rolenum = 8;
+                    break;
+                case "sitemanager":
+                    rolenum = 128;
+                    break;
+                case "director":
+                    rolenum = 64;
+                    break;
+                case "developer":
+                    rolenum = 256;
+                    break;
+                case "compliance":
+                    rolenum = 2;
+                    break;
+                case "riskmanager":
+                    rolenum = 1024;
+                    break;
+                default:
+                    break;
+            }
+            if ((window.currentUser.role & rolenum) >0) {
+                return true;
+            }else {
+                sessionStorage.removeItem('role');
+                return false;
+            }
+        }
+
+        if (hasRole()) {
+            $scope.role = sessionStorage.getItem('role');
+        }
 
         $scope.editRateConfig = function () {
             $uibModal.open({
diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
index 31dc55ebe..a1d5923f8 100644
--- a/src/main/ui/static/menu/templates/home.html
+++ b/src/main/ui/static/menu/templates/home.html
@@ -10,7 +10,7 @@
     }
 
     .box-items {
-        padding: 30px 15px 15px 15px;
+        padding: 30px 1% 15px 1%;
         cursor: pointer;
 
     }
@@ -71,7 +71,7 @@
 
     <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
         <div class="box-items" ng-if="'100'|withRole">
-            <a ng-click="headerShow('bduser')" ui-sref="listMenu({role:'bduser'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('bduser')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_1.png">
                 </div>
@@ -80,7 +80,7 @@
         </div>
 
         <div class="box-items" ng-if="'10000000000'|withRole">
-            <a ng-click="headerShow('riskmanager')" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('riskmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_2.png">
                 </div>
@@ -89,7 +89,7 @@
         </div>
 
         <div class="box-items" ng-if="'10'|withRole">
-            <a ng-click="headerShow('compliance')" ui-sref="listMenu({role:'compliance'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('compliance')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_3.png">
                 </div>
@@ -98,7 +98,7 @@
         </div>
 
         <div class="box-items" ng-if="'1000'|withRole">
-            <a ng-click="headerShow('accountant')" ui-sref="listMenu({role:'accountant'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('accountant')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_4.png">
                 </div>
@@ -107,7 +107,7 @@
         </div>
 
         <div class="box-items" ng-if="'10000000000000'|withRole">
-            <a ng-click="headerShow('salesmanager')" ui-sref="listMenu({role:'salesmanager'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('salesmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_5.png">
                 </div>
@@ -116,7 +116,7 @@
         </div>
 
         <div class="box-items" ng-if="'10000000'|withRole">
-            <a ng-click="headerShow('sitemanager')" ui-sref="listMenu({role:'sitemanager'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('sitemanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_6.png">
                 </div>
@@ -125,7 +125,7 @@
         </div>
 
         <div class="box-items" ng-if="'1000000'|withRole">
-            <a ng-click="headerShow('director')" ui-sref="listMenu({role:'director'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('director')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_7.png">
                 </div>
@@ -134,7 +134,7 @@
         </div>
 
         <div class="box-items" ng-if="'1'|withRole">
-            <a ng-click="headerShow('administrator')" ui-sref="listMenu({role:'administrator'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('administrator')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_8.png">
                 </div>
@@ -143,7 +143,7 @@
         </div>
 
         <div class="box-items" ng-if="'100000000'|withRole">
-            <a ng-click="headerShow('developer')" ui-sref="listMenu({role:'developer'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('developer')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_9.png">
                 </div>
@@ -152,7 +152,7 @@
         </div>
 
         <!--<div class="box-items" ng-if="'1000000'|withRole">-->
-        <!--<a ng-click="headerShow()" ui-sref="listMenu({role:'datacontent'})" ui-sref-opts="{reload:true}">-->
+        <!--<a ng-click="headerShow()" ui-sref="listMenu()" ui-sref-opts="{reload:true}">-->
         <!--<div class="boxs">-->
         <!--<img src="/static/images/manage/menu_10.png">-->
         <!--</div>-->
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 15745fb13..69099262d 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -32,7 +32,7 @@
             </div>
         </div>
 -->     <a role="button" style="float: right;line-height: 46px" ui-sref="home" ng-click="headerCopyDisplay()"><i class="fa fa-reply"></i> 返回</a>
-        <div class="list-group" ng-if="role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -103,7 +103,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">