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

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

@@ -932,6 +932,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isBlank(dto.getSortFiled())) {
             criA.getOrderBy().orderBy("createTime", dto.getSortType());
         } else {
+            if(dto.getSortFiled().equals("ipRoleCountFilter")){
+                dto.setSortFiled("roleUserIpCount");
+            }
+            if(dto.getSortFiled().equals("roleUserIpCountFilter")){
+                dto.setSortFiled("roleCountGroupFiltersCount");
+            }
             criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
         }
         //列表sql
@@ -1648,8 +1654,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
                       d.role_count as roleCount,
                       d.user_role_count as userRoleCount,
                       d.role_user_ip_count as roleUserIpCount,
-                      d.role_count_group_filters_count as roleCountGroupFiltersCount,
-                      d.role_user_group_filters_count as roleUserGroupFiltersCount,
+                      d.role_count_group_filters_count as ipRoleCountFilter,
+                      d.role_user_group_filters_count as roleUserIpCountFilter,
                       IFNULL(d.suspected_count,0) as suspectedCount
                 from game_ads.ads_role_level_log a
                         left join dm_game_order.t_role_operate b on a.user_id = b.user_id