From a9a74e58cf166c21d2151cbc5f3c7d583e6487a2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 10:44:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=A2=86=E5=AF=BC=E5=86=B3=E7=AD=96?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=90=88=E4=BC=99=E4=BA=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                          | 4 ++--
 src/main/ui/static/menu/templates/main_menu.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index dd6d4db8b..3cb91bb07 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -626,7 +626,7 @@ margin-bottom: 10%;"/>
                 <li class="treeview" ng-if="roleNow=='administrator'">
                     <a href="javascript:;">
                         <i class="fa fa-users"></i>
-                        <span>组织架构|Organization Framework</span>
+                        <span>组织架构|Organization</span>
                     </a>
                     <ul class="treeview-menu">
                         <li ui-sref-active="active" ng-if="'org'|withModule">
@@ -691,7 +691,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='salesmanager'">
+                <li class="treeview" ng-if="(role=='salesmanager') || (role=='director')">
                     <a href="javascript:;">
                         <i class="fa fa-tv"></i>
                         <span>合伙人管理</span>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 0d9e31e83..15745fb13 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -307,7 +307,7 @@
               </div>
           </div>
         </div>
-        <div class="list-group" ng-if="role=='salesmanager'">
+        <div class="list-group" ng-if="(role=='salesmanager') || (role=='director')">
             <div class="row" ng-if="('citypartner'|withModule)||('org'|withModule)||(('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole)))||('orgcommission'|withModule)" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="citypartners">
                     <div class="description-block">