From a889d06770c3ade1d0b06e6a7b90205725a140a3 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 1 Aug 2018 11:21:17 +0800
Subject: [PATCH] update

---
 .../permission/manager/ManagerUserInterceptor.java | 14 +++++++-------
 src/main/ui/index.html                             | 14 ++++++++++++--
 src/main/ui/static/boot/indexMainApp.js            |  3 ++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java
index 124ffe67c..644449dcd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java
+++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java
@@ -104,13 +104,13 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements
             }
         }
 
-//        JSONObject func = permissionPartnerManager.getPartnerFuncById(funcId);
-//        if(func!=null && StringUtils.isNotEmpty(func.getString("module_id"))){
-//            JSONArray arr = loginUser.getJSONArray("available_module_ids");
-//            if (arr == null || !arr.contains(func.getString("module_id"))) {
-//                throw new ForbiddenException("error.permission.nopermission");
-//            }
-//        }
+        JSONObject func = permissionPartnerManager.getPartnerFuncById(funcId);
+        if(func!=null && StringUtils.isNotEmpty(func.getString("module_id"))){
+            JSONArray arr = loginUser.getJSONArray("available_module_ids");
+            if (arr == null || !arr.contains(func.getString("module_id"))) {
+                throw new ForbiddenException("error.permission.nopermission");
+            }
+        }
         request.setAttribute(CommonConsts.PARTNER_STATUS, loginUser);
     }
 
diff --git a/src/main/ui/index.html b/src/main/ui/index.html
index fffcf5385..60ad4e993 100644
--- a/src/main/ui/index.html
+++ b/src/main/ui/index.html
@@ -926,17 +926,27 @@ margin-bottom: 10%;"/>
                                     &lt;!&ndash;<i class="fa fa-shopping-cart"></i>&ndash;&gt;Sale
                                 </a>
                             </li>-->
-                            <li ng-if="currentUser.client.client_moniker=='PINE' || currentUser.client.client_moniker=='OCCO'">
+                            <li ng-if="13|withPartnerModule">
                                 <a ui-sref="bill_qrcode">
                                     Bill QR Code
                                 </a>
                             </li>
 
-                            <li ng-if="currentUser.client.client_moniker=='WOWW' || currentUser.client.client_moniker=='PINE'">
+                            <li ng-if="31|withPartnerModule">
                                 <a ui-sref="custom">
                                     Report Custom
                                 </a>
                             </li>
+                            <li ui-sref-active="active" ng-if="30|withPartnerModule">
+                                <a ui-sref="vipcustomers">
+                                   VIP Qrcode
+                                </a>
+                            </li>
+                            <li ui-sref-active="active" ng-if="(currentUser.role=='1' || currentUser.role=='2') && currentUser.client.approve_result==1 && 29|withPartnerModule" title="店长红包|Manager Welfare">
+                                <a ui-sref="partner_wechat">
+                                    店长红包|Manager Welfare
+                                </a>
+                            </li>
                         </ul>
                     </li>
 
diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js
index c214a29bd..e51254417 100644
--- a/src/main/ui/static/boot/indexMainApp.js
+++ b/src/main/ui/static/boot/indexMainApp.js
@@ -562,7 +562,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             angular.forEach($rootScope.currentUser.available_module_ids, function (item) {
                 if((item+'') == (module+'')){
                     result = true;
-                    return ;
+                    return result;
                 }
             });
             return result;
@@ -574,6 +574,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         };
     }]);
 
+
     app.constant('uiDatetimePickerConfig', {
         dateFormat: 'yyyy-MM-dd HH:mm',
         defaultTime: '00:00:00',