|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.steerinfo.dil.aspect.LogAspect;
|
|
import com.steerinfo.dil.aspect.LogAspect;
|
|
|
import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
|
|
import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
|
|
|
|
|
+import com.steerinfo.dil.util.DisposeRoleData;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.log4j.Logger;
|
|
import org.apache.log4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -18,6 +19,7 @@ import java.io.BufferedReader;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
import java.io.InputStreamReader;
|
|
import java.io.InputStreamReader;
|
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
@Component
|
|
@Component
|
|
@@ -31,6 +33,9 @@ public class RequestFilter implements Filter {
|
|
|
@Resource
|
|
@Resource
|
|
|
private BackgroundProcessingMapper backgroundProcessingMapper;
|
|
private BackgroundProcessingMapper backgroundProcessingMapper;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private DisposeRoleData disposeRoleData;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
|
|
public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
|
|
|
try{
|
|
try{
|
|
@@ -88,6 +93,8 @@ public class RequestFilter implements Filter {
|
|
|
httpRequest.setAttribute("roleCodes", roleCodesObject);
|
|
httpRequest.setAttribute("roleCodes", roleCodesObject);
|
|
|
//Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
|
|
//Object dilCompanyListObject = JSONObject.parse(dilCompanyList);
|
|
|
Object dilCompanyListObject = backgroundProcessingMapper.getCompanyList(userId);
|
|
Object dilCompanyListObject = backgroundProcessingMapper.getCompanyList(userId);
|
|
|
|
|
+ Object roleFinalList = disposeRoleData.disposeRoleData(roleCodesObject,dilCompanyListObject);
|
|
|
|
|
+ httpRequest.setAttribute("roleFinalList",roleFinalList);
|
|
|
httpRequest.setAttribute("dilCompanyList",dilCompanyListObject);
|
|
httpRequest.setAttribute("dilCompanyList",dilCompanyListObject);
|
|
|
Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
|
|
Object rootCompanyMapObject = JSONObject.parse(rootCompanyMap);
|
|
|
httpRequest.setAttribute("rootCompanyMap",rootCompanyMapObject);
|
|
httpRequest.setAttribute("rootCompanyMap",rootCompanyMapObject);
|
|
@@ -107,6 +114,7 @@ public class RequestFilter implements Filter {
|
|
|
params.put("orgCode", orgCode);
|
|
params.put("orgCode", orgCode);
|
|
|
params.put("roleCodes",roleCodesObject);
|
|
params.put("roleCodes",roleCodesObject);
|
|
|
params.put("dilCompanyList",dilCompanyListObject);
|
|
params.put("dilCompanyList",dilCompanyListObject);
|
|
|
|
|
+ params.put("roleFinalList",roleFinalList);
|
|
|
params.put("rootCompanyMap",rootCompanyMapObject);
|
|
params.put("rootCompanyMap",rootCompanyMapObject);
|
|
|
params.put("accessToken",accessToken);
|
|
params.put("accessToken",accessToken);
|
|
|
params.put("urlFlag",urlFlag);
|
|
params.put("urlFlag",urlFlag);
|