去除‘null’字符串影响

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/PlayerDataServiceImpl.java

@@ -337,6 +337,10 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
             if (StringUtils.isNotBlank(gameClassify)) {
                 vo.setGameCategoryName(gameClassify);
             }
+            //“null”字符串处理
+            if ("null".equals(vo.getCountry())) {
+                vo.setCountry(null);
+            }
         return vo;
         }).collect(Collectors.toList());
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -3204,7 +3204,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		a.role_id ,
                 		b.role_name,
                 		a.role_level ,
-                		b.country,
+                		IF(b.country = 'null',NULL,b.country) as country,
                 		a.role_vip ,
                 		a.total_amount ,
                 		a.combat_num ,
@@ -3280,7 +3280,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		a.role_vip ,
                 		a.total_amount ,
                 		a.combat_num ,
-                		b.country,
+                		IF(b.country = 'null',NULL,b.country) as country,
                 		ROW_NUMBER()over(partition by a.source_system ,a.boss_server_id ,a.super_game_id order by a.combat_num desc) as rank_num
                 	FROM (
                 		SELECT