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服务启动成功 < (游戏玩家充值白名单操作接口-01 ･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (游戏玩家充值白名单操作接口-02 ･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -80,6 +80,8 @@ public class UserRechargeWhiteServiceImpl extends ServiceImpl<UserRechargeWhiteM
     public IPage<UserRechargeWhiteVO> listOfPage(UserRechargeWhiteListParam param) {
         //玩家id列表
         List<Long> userIdList = null;
+        //是否存在条件筛选
+        boolean hasCondition = false;
         //账号条件
         if (Strings.isNotBlank(param.getAccount())) {
             userIdList = userService.list(new LambdaQueryWrapper<User>()
@@ -88,6 +90,7 @@ public class UserRechargeWhiteServiceImpl extends ServiceImpl<UserRechargeWhiteM
                             .or().eq(User::getUsername, param.getAccount())
                             .or().eq(User::getId, param.getAccount()))
             ).stream().map(User::getId).collect(Collectors.toList());
+            hasCondition = true;
         }
         //角色条件
         if (Strings.isNotBlank(param.getRoleId()) || Strings.isNotBlank(param.getRoleName())) {
@@ -97,6 +100,13 @@ public class UserRechargeWhiteServiceImpl extends ServiceImpl<UserRechargeWhiteM
                     .eq(Strings.isNotBlank(param.getRoleId()), GameUserRole::getRoleId, param.getRoleId())
                     .like(Strings.isNotBlank(param.getRoleName()), GameUserRole::getRoleName, param.getRoleName())
             ).stream().map(GameUserRole::getUserId).distinct().collect(Collectors.toList());
+            hasCondition = true;
+        }
+        //有条件, 但是未筛选出玩家id
+        if (hasCondition && CollectionUtils.isEmpty(userIdList)) {
+            Page<UserRechargeWhiteVO> userRechargeWhiteVOPage = new Page<>(param.getPageNum(),
+                    param.getPageSize(), 0L);
+            userRechargeWhiteVOPage.setRecords(Collections.emptyList());
         }
         //分页查询
         IPage<UserRechargeWhite> rechargeWhitePage = super.page(param.toPage(), new LambdaQueryWrapper<UserRechargeWhite>()
@@ -125,7 +135,7 @@ public class UserRechargeWhiteServiceImpl extends ServiceImpl<UserRechargeWhiteM
             UserRechargeWhiteVO userRechargeWhiteVO = BeanUtil.copy(userRechargeWhite, UserRechargeWhiteVO.class);
             User user = userMap.get(userRechargeWhiteVO.getUserId());
             userRechargeWhiteVO.setUsername(user.getUsername());
-            userRechargeWhiteVO.setMobile(user.getMobile());
+            userRechargeWhiteVO.setMobile(user.getShowPhoneNum());
             userRechargeWhiteVO.setGameName(gameMap.get(userRechargeWhiteVO.getGameId()));
             return userRechargeWhiteVO;
         }).collect(Collectors.toList());