.

src/main/java/com/chinaitop/agile/AppendParametersFilter.java

@@ -1,70 +0,0 @@
-package com.chinaitop.agile;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import com.chinaitop.agile.utils.ParameterRequestWrapper;
-import com.chinaitop.agile.utils.DataPolicyEngine;
-
-
-//@WebFilter
-//@Order(1)
-//@Component
-public class AppendParametersFilter implements Filter {
-//    @Autowired
-//    private RedisUtil redisUtil;
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper((HttpServletRequest) request);
-
-        String orgid = requestWrapper.getParameter("orgId");
-
-        //先给orgId赋值
-        if (StringUtils.isBlank(orgid)) {
-        	orgid = ObjectUtils.toString(DataPolicyEngine.get());
-        }
-        if ("10".equals(orgid)) {
-        	orgid = null;
-        }
-
-        //判断赋值后的orgId是不是空的，如果不是则把参数到url中
-        if (StringUtils.isNotBlank(orgid)) {
-        	Integer orgId = Integer.parseInt(orgid);
-        	// 将参数追加到request url 之后
-        	requestWrapper.addParameter("orgId", orgId);
-        	requestWrapper.addParameter("unitid", orgId);
-        	// 将参数追加到request 的body 中
-        	requestWrapper.addParameterToBody("orgId", orgId);
-        	requestWrapper.addParameterToBody("unitid", orgId);
-        }
-
-        // 过滤链调用
-        chain.doFilter(requestWrapper, response);
-    }
-
-	@Override
-	public void destroy() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void init(FilterConfig arg0) throws ServletException {
-		// TODO Auto-generated method stub
-		
-	}
-}

src/main/java/com/chinaitop/agile/utils/CustomFilter.java

@@ -31,6 +31,9 @@ public class CustomFilter implements Filter {
 		if (session != null){
 			orgId = ObjectUtils.toString(session.getAttribute("orgId"),"");
 		}
+		if ("10".equals(orgId)) {
+			orgId = null;
+		}
 		if (!orgId.isEmpty()) {
 			DataPolicyEngine.set(orgId);
 			// 将参数追加到request url 之后
@@ -40,7 +43,7 @@ public class CustomFilter implements Filter {
         	requestWrapper.addParameterToBody("orgId", orgId);
         	requestWrapper.addParameterToBody("unitid", orgId);
 		}
-		arg2.doFilter(arg0, arg1);
+		arg2.doFilter(requestWrapper, arg1);
 		DataPolicyEngine.remove();
 	}