|
|
@@ -9,6 +9,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Enumeration;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
|
@@ -42,21 +43,21 @@ public class UserInfoHandler extends HandlerInterceptorAdapter {
|
|
|
if (StringUtils.isNotBlank(userName)) {
|
|
|
requestInfo.setUsername(userName);
|
|
|
}
|
|
|
- String scopeDeptIds = request.getHeader(HeaderConstant.SCOPE_DEPT_IDS);
|
|
|
- if (StringUtils.isNotBlank(scopeDeptIds)) {
|
|
|
+ Enumeration<String> scopeDeptIds = request.getHeaders(HeaderConstant.SCOPE_DEPT_IDS);
|
|
|
+ if (scopeDeptIds != null) {
|
|
|
requestInfo.setScopeDeptIds(strToArray(scopeDeptIds));
|
|
|
}
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- private List<Integer> strToArray(String scopeDeptIds) {
|
|
|
+ private List<Integer> strToArray(Enumeration<String> scopeDeptIds) {
|
|
|
if(scopeDeptIds == null) {
|
|
|
return null;
|
|
|
}
|
|
|
List<Integer> rs = new ArrayList<>();
|
|
|
- String[] array = scopeDeptIds.split(",");
|
|
|
- for(String temp : array) {
|
|
|
- rs.add(Integer.valueOf(temp));
|
|
|
+ while(scopeDeptIds.hasMoreElements()){
|
|
|
+ String value = scopeDeptIds.nextElement();
|
|
|
+ rs.add(Integer.valueOf(value));
|
|
|
}
|
|
|
return rs;
|
|
|
}
|