|
@@ -151,7 +151,8 @@ public class AccessInterceptor implements HandlerInterceptor {
|
151
|
151
|
|
152
|
152
|
//检验按钮权限
|
153
|
153
|
private boolean checkButtonRole(HttpServletRequest request) {
|
154
|
|
- if(StringUtils.isEmpty(request.getHeader("x-action"))){
|
|
154
|
+ String action = request.getHeader("x-action");
|
|
155
|
+ if(StringUtils.isEmpty(action)){
|
155
|
156
|
return false;
|
156
|
157
|
}
|
157
|
158
|
//根据路径匹配code 一致继续 否则无权限
|
|
@@ -161,15 +162,16 @@ public class AccessInterceptor implements HandlerInterceptor {
|
161
|
162
|
if (null == taButtonUriMap){
|
162
|
163
|
return true;
|
163
|
164
|
}
|
|
165
|
+
|
164
|
166
|
|
165
|
|
- if (!taButtonUriMap.getButtonCode().equals(request.getHeader("x-action"))){
|
|
167
|
+ if (!taButtonUriMap.getButtonCode().equals(action)){
|
166
|
168
|
return false;
|
167
|
169
|
}
|
168
|
170
|
|
169
|
171
|
//根据code查询按钮权限
|
170
|
172
|
Map map = JWTUtils.getUserIdAndOrgId(request);
|
171
|
173
|
QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
|
172
|
|
- sysButtonInMenuQueryWrapper.eq("code",request.getHeader("x-action"));
|
|
174
|
+ sysButtonInMenuQueryWrapper.eq("code",action);
|
173
|
175
|
SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
|
174
|
176
|
if (null == sysButtonInMenu){
|
175
|
177
|
return false;
|