Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -61,7 +61,7 @@ public class AccessInterceptor implements HandlerInterceptor {
     @Override
     public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)
             throws Exception {
-        arg1.setHeader("Access-Control-Expose-Headers","content-type");
+
     }
 
     /*
@@ -70,7 +70,7 @@ public class AccessInterceptor implements HandlerInterceptor {
     @Override
     public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)
             throws Exception {
-        arg1.setHeader("Access-Control-Expose-Headers","content-type");
+
     }
 
     @Override
@@ -151,7 +151,8 @@ public class AccessInterceptor implements HandlerInterceptor {
     
     //检验按钮权限
     private boolean checkButtonRole(HttpServletRequest request) {
-        if(StringUtils.isEmpty(request.getHeader("x-action"))){
+        String action = request.getHeader("x-action");
+        if(StringUtils.isEmpty(action)){
             return false;
         }
         //根据路径匹配code 一致继续 否则无权限
@@ -161,15 +162,16 @@ public class AccessInterceptor implements HandlerInterceptor {
         if (null == taButtonUriMap){
             return true;
         }
+    
         
-        if (!taButtonUriMap.getButtonCode().equals(request.getHeader("x-action"))){
+        if (!taButtonUriMap.getButtonCode().equals(action)){
             return false;
         }
         
         //根据code查询按钮权限
         Map map = JWTUtils.getUserIdAndOrgId(request);
         QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
-        sysButtonInMenuQueryWrapper.eq("code",request.getHeader("x-action"));
+        sysButtonInMenuQueryWrapper.eq("code",action);
         SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
         if (null == sysButtonInMenu){
             return false;