fix

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.auth.api.anno.MenuCheck;
 import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
 import com.gic.haoban.auth.api.enums.RoleCodeEnum;
-import com.gic.haoban.common.utils.AuthRequestUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.LoginVO;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,7 +56,7 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
         logger.info("post-url:{}", requestURI);
         Map<String, String[]> parameterMap = httpServletRequest.getParameterMap();
         logger.info("post-params:{}", JSONObject.toJSONString(parameterMap));
-        UserRightDetailDTO loginUser = (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
+        LoginVO loginUser = (LoginVO) AuthRequestUtil.getSessionUser();
 
         if (loginUser == null) {
             this.errorResult(httpServletResponse, HaoBanErrCode.ERR_4);
@@ -69,31 +71,11 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
             return true;
         }
         MenuCheck methodAnnotation = method.getMethodAnnotation(MenuCheck.class);
-        if (StringUtils.isNotBlank(loginUser.getEnterpriseId())) {
-            httpServletRequest.setAttribute("enterpriseId", loginUser.getEnterpriseId());
-        }
-        if (StringUtils.isNotBlank(loginUser.getUserId())) {
-            httpServletRequest.setAttribute("clerkId", loginUser.getUserId());
+        if (StringUtils.isNotBlank(loginUser.getWxEnterpriseId())) {
+            httpServletRequest.setAttribute("wxEnterpriseId", loginUser.getWxEnterpriseId());
         }
-        if (null != methodAnnotation) {
-            String value = methodAnnotation.value();
-            RoleCodeEnum[] roleCodes = methodAnnotation.roleCodes();
-            boolean b = true;
-            //权限判断
-            if (StringUtils.isNotBlank(value)) {
-                b = loginUser.checkRight(value);
-            }
-            //角色判读
-            if (b) {
-                if (roleCodes.length > 0) {
-                    b = Arrays.stream(roleCodes).anyMatch(codeEnum -> loginUser.checkRole(codeEnum.getCode()));
-                }
-            }
-            if (!b) {
-                logger.info("缺少权限");
-                errorResult(httpServletResponse, HaoBanErrCode.ERR_7);
-            }
-            return b;
+        if (loginUser.getStaffDTO() != null) {
+            httpServletRequest.setAttribute("staffDTO", loginUser.getStaffDTO());
         }
         return true;
     }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -29,4 +29,8 @@
 	<dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="departmentService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.DepartmentApiService" id="departmentApiService"/>
 	<dubbo:reference interface="com.gic.enterprise.api.service.StoreGroupService" id="storeGroupService"/>
+	
+	<dubbo:reference interface="com.gic.clerk.api.service.ClerkService" id="clerkService"/>
+	
+	
 </beans>