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服务启动成功 < (发码器代码完成提交2100･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交2200･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -130,7 +130,7 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
                 .eq(RoleOperate::getGameId, gameUserRole.getGameId())
                 .eq(RoleOperate::getServerId, gameUserRole.getServerId())
                 .eq(RoleOperate::getRoleId, gameUserRole.getRoleId()));
-        String userPhone = Strings.isBlank(roleOperate.getUserPhone()) ? null : roleOperate.getUserPhone();
+        String userPhone = roleOperate == null || Strings.isBlank(roleOperate.getUserPhone()) ? null : roleOperate.getUserPhone();
         //返回结果
         resultMap.put("result", Boolean.TRUE);
         resultMap.put("msg", "角色名称检测成功");