Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <权限修改提交2> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <权限修改提交3> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAuthServiceImpl.java

@@ -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);