|
@@ -2,6 +2,7 @@ package com.mrxu.framework.boot.handle;
|
|
|
|
|
|
|
|
import com.mrxu.framework.boot.bean.RpcRequestInfo;
|
|
import com.mrxu.framework.boot.bean.RpcRequestInfo;
|
|
|
import com.mrxu.framework.boot.feign.HeaderConstant;
|
|
import com.mrxu.framework.boot.feign.HeaderConstant;
|
|
|
|
|
+import com.mrxu.framework.common.MrxuConst;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
|
|
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
|
|
@@ -43,9 +44,9 @@ public class FeignHandlerInterceptorAdapter extends HandlerInterceptorAdapter {
|
|
|
if (StringUtils.isNotBlank(userName)) {
|
|
if (StringUtils.isNotBlank(userName)) {
|
|
|
requestInfo.setUsername(userName);
|
|
requestInfo.setUsername(userName);
|
|
|
}
|
|
}
|
|
|
- Enumeration<String> scopeDeptIds = request.getHeaders(HeaderConstant.SCOPE_DEPT_IDS);
|
|
|
|
|
- if (scopeDeptIds != null) {
|
|
|
|
|
- requestInfo.setScopeDeptIds(strToArray(scopeDeptIds));
|
|
|
|
|
|
|
+ List<Integer> scopeDeptIds = strToArray(request.getHeaders(HeaderConstant.SCOPE_DEPT_IDS));
|
|
|
|
|
+ if (scopeDeptIds != null && scopeDeptIds.size() > MrxuConst.zero) {
|
|
|
|
|
+ requestInfo.setScopeDeptIds(scopeDeptIds);
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|