|
@@ -151,7 +151,7 @@ public class GameAuthServiceImpl extends ServiceImpl<GameAuthMapper, GameAuth> i
|
|
|
//超管权限
|
|
|
if (SecurityUtil.isAdmin()) {
|
|
|
List<Long> gameIdList = super.list(new LambdaQueryWrapper<GameAuth>()
|
|
|
- .eq(Strings.isNotBlank(userId), GameAuth::getUserId, Long.valueOf(userId))
|
|
|
+ .eq(Strings.isNotBlank(userId), GameAuth::getUserId, Strings.isBlank(userId) ? null : Long.valueOf(userId))
|
|
|
).stream().map(GameAuth::getGameId).collect(Collectors.toList());
|
|
|
return Tuples.of("admin", gameIdList);
|
|
|
}
|
|
@@ -163,7 +163,7 @@ public class GameAuthServiceImpl extends ServiceImpl<GameAuthMapper, GameAuth> i
|
|
|
}
|
|
|
List<Long> gameIdList = super.list(new LambdaQueryWrapper<GameAuth>()
|
|
|
.eq(Strings.isBlank(userId), GameAuth::getUserId, SecurityUtil.getUserId())
|
|
|
- .eq(Strings.isNotBlank(userId), GameAuth::getUserId, Long.valueOf(userId))
|
|
|
+ .eq(Strings.isNotBlank(userId), GameAuth::getUserId, Strings.isBlank(userId) ? null : Long.valueOf(userId))
|
|
|
).stream().map(GameAuth::getGameId).collect(Collectors.toList());
|
|
|
//返回角色权限以及游戏
|
|
|
return Tuples.of(gameAuthRole.getAuthType(), gameIdList);
|