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

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

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (游戏玩家充值白名单操作接口-02 ･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (游戏玩家充值白名单操作接口-03 ･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -102,11 +102,12 @@ public class UserRechargeWhiteServiceImpl extends ServiceImpl<UserRechargeWhiteM
             ).stream().map(GameUserRole::getUserId).distinct().collect(Collectors.toList());
             hasCondition = true;
         }
-        //有条件, 但是未筛选出玩家id
+        //有条件, 但是未筛选出玩家id, 不返回数据
         if (hasCondition && CollectionUtils.isEmpty(userIdList)) {
             Page<UserRechargeWhiteVO> userRechargeWhiteVOPage = new Page<>(param.getPageNum(),
                     param.getPageSize(), 0L);
             userRechargeWhiteVOPage.setRecords(Collections.emptyList());
+            return userRechargeWhiteVOPage;
         }
         //分页查询
         IPage<UserRechargeWhite> rechargeWhitePage = super.page(param.toPage(), new LambdaQueryWrapper<UserRechargeWhite>()