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

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

@@ -1634,7 +1634,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
 
     private String getLevelListSql(Criteria criA) {
         return """
-                      select a.country             as country,
+                      select e.country             as country,
                       a.role_id             as roleId,
                       a.role_name           as roleName,
                       a.user_id             as userId,
@@ -1672,13 +1672,14 @@ public class RoleManageServiceImpl implements IRoleManageService {
                    and a.user_id = d.user_id
                    and a.server_id = d.server_id
                    and a.game_id = d.game_id
+                    left join dm_game_order.t_game_user_role e on a.user_id = e.user_id and a.role_id = e.role_id and e.source_system = 'ZX_ONE' and e.country != 'null' and e.country !=''
                          """ + criA;
     }
 
     private String getLevelListCountSql(Criteria criA) {
         return """
                 select count(1) from (
-                 select a.country             as country,
+                 select e.country             as country,
                         a.role_id             as roleId,
                         a.role_name           as roleName,
                         a.user_id             as userId,
@@ -1713,6 +1714,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                      and a.user_id = d.user_id
                      and a.server_id = d.server_id
                      and a.game_id = d.game_id
+                      left join dm_game_order.t_game_user_role e on a.user_id = e.user_id and a.role_id = e.role_id and e.source_system = 'ZX_ONE' and e.country != 'null' and e.country !=''
                        """ + criA + """
                                      ) a
                 """;