fix

nb-service/web-service/src/main/java/com/nb/web/service/system/auth/WebAuthGranter.java

@@ -74,7 +74,7 @@ public class WebAuthGranter implements IAuthGranter {
             String requestFrom = request.getHeader("RequestFrom");
             //来自app的请求不需要验证码
             if(!"TuoRenApp".equals(requestFrom)){
-                captchaTool.ver(source.getCodeKey(),source.getCode());
+//                captchaTool.ver(source.getCodeKey(),source.getCode());
             }
         }
         sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getAccount, source.getUsername())
@@ -96,7 +96,7 @@ public class WebAuthGranter implements IAuthGranter {
         }
         log.info("登录用户：{}", source.getUsername());
         // 查询角色列表
-        List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(sysUser.getId());
+        List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(sysUser.getId(),String.valueOf(sysUser.getTenantId()));
         // 查询权限标识
         Set<String> permissions  = sysMenuService.getPermissionsByUserId(sysUser.getId());
 

nb-service/web-service/src/main/java/com/nb/web/service/system/service/ISysRoleService.java

@@ -107,6 +107,8 @@ public interface ISysRoleService extends IService<SysRole> {
      */
     List<SysRole> listSysRoleByUserId(Long userId);
 
+    List<SysRole> listSysRoleByUserId(Long userId, String tenantId);
+
     /**
      * 下拉列表
      *

nb-service/web-service/src/main/java/com/nb/web/service/system/service/impl/SysRoleServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -175,13 +176,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                     List<String> tokens =stpLogic.getTokenValueListByLoginId(sysUserRole.getUserId());
                     tokens.
                             parallelStream().forEach(token->{
-                                SaSession tokenSessionByToken = stpLogic.getTokenSessionByToken(token);
-                                LoginUser user = (LoginUser) tokenSessionByToken.get(Constants.LOGIN_USER_KEY);
-                                if(user!=null){
-                                    user.setPermissions(permissionsByUserId);
-                                    tokenSessionByToken.set(Constants.LOGIN_USER_KEY,user);
-                                }
-                            });
+                        SaSession tokenSessionByToken = stpLogic.getTokenSessionByToken(token);
+                        LoginUser user = (LoginUser) tokenSessionByToken.get(Constants.LOGIN_USER_KEY);
+                        if(user!=null){
+                            user.setPermissions(permissionsByUserId);
+                            tokenSessionByToken.set(Constants.LOGIN_USER_KEY,user);
+                        }
+                    });
                 });
     }
 
@@ -217,7 +218,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public List<SysRole> listSysRoleByUserId(Long userId) {
-        List<SysUserRole> sysUserRoleList = sysUserRoleService.list(Wrappers.lambdaQuery(SysUserRole.class).eq(SysUserRole::getUserId, userId));
+        return listSysRoleByUserId(userId,null);
+    }
+
+    @Override
+    public List<SysRole> listSysRoleByUserId(Long userId, String tenantId) {
+        List<SysUserRole> sysUserRoleList = sysUserRoleService.list(Wrappers.lambdaQuery(SysUserRole.class).eq(SysUserRole::getUserId, userId)
+                .eq(StrUtil.isNotEmpty(tenantId),SysUserRole::getTenantId,tenantId));
         if (sysUserRoleList.isEmpty()) {
             return Lists.newArrayList();
         }