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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleLevelParamDTO.java

@@ -71,4 +71,10 @@ public class RoleLevelParamDTO extends BasePage {
    @ApiModelProperty(value = "运营id")
    private Long operUserId;
 
+   @ApiModelProperty(notes = "排序字段")
+   private String sortFiled;
+
+   @ApiModelProperty(notes = "排序方式：升序asc;降序desc")
+   private String sortType;
+
 }

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

@@ -920,6 +920,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
         countSql.setCallback(Sqls.callback.integer());
         dao.execute(countSql);
         pager.setRecordCount(countSql.getInt());
+        //主表添加排序条件
+        if (StringUtils.isBlank(dto.getSortType())) {
+            dto.setSortType(OrderByEnum.DESC.getOrderType());
+        }
+        if (StringUtils.isBlank(dto.getSortFiled())) {
+            criA.getOrderBy().orderBy("createTime", dto.getSortType());
+        } else {
+            criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
+        }
         //列表sql
         String levelListSql = getLevelListSql(criA);
         Sql sql = Sqls.create(levelListSql);