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

@@ -1038,17 +1038,18 @@ public class RoleManageServiceImpl implements IRoleManageService {
         countSql.setCallback(Sqls.callback.integer());
         dao.execute(countSql);
         pager.setRecordCount(countSql.getInt());
+        Criteria orderCri = Cnd.cri();
         //主表添加排序条件
         if (StringUtils.isBlank(dto.getSortType())) {
             dto.setSortType(OrderByEnum.DESC.getOrderType());
         }
         if (StringUtils.isBlank(dto.getSortFiled())) {
-            criA.getOrderBy().orderBy("roleTotalAmount", dto.getSortType());
+            orderCri.getOrderBy().orderBy("roleTotalAmount", dto.getSortType());
         } else {
-            criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
+            orderCri.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
         }
         //列表sql
-        String gameCountryRoleListSql = getGameCountryRoleListSql(criA);
+        String gameCountryRoleListSql = getGameCountryRoleListSql(criA,orderCri);
         Sql sql = Sqls.create(gameCountryRoleListSql);
         sql.setCallback(Sqls.callback.maps());
         sql.setPager(pager);
@@ -1290,7 +1291,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 """ + criteria;
     }
 
-    private String getGameCountryRoleListSql(Criteria criA) {
+    private String getGameCountryRoleListSql(Criteria criA,Criteria orderCri) {
         return """
                 select a.country as country,a.role_id as roleId,a.user_id as userId ,any_value(a.role_name) as roleName ,any_value(a.role_level) as roleLevel ,any_value(combat_num) as combatNum,
                                                                                                             a.server_id as serverId ,any_value(a.server_name) as serverName ,any_value(create_time) as createTime,SUM(IFNULL(b.amount,0)) as roleTotalAmount
@@ -1298,7 +1299,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                                                                                             left join game_dw.dw_order_day_amount b on a.role_id = b.role_id
                                                                                                             """ + criA + """
                  GROUP BY a.country, a.role_id, a.user_id, a.server_id
-                """;
+                """+ orderCri;
     }
 
     private String getGameCountryRoleCountSql(Criteria criA) {