master
kira 6 years ago
parent 7cea42ba44
commit a889d06770

@ -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);
}

@ -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>

@ -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',

Loading…
Cancel
Save