From b4db9d67b2b4643d1d6b02928d63e27aa8930900 Mon Sep 17 00:00:00 2001 From: none Date: Fri, 3 Mar 2023 15:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/backend/CourseController.java | 4 ++-- .../controller/backend/ResourceController.java | 4 ++-- .../api/controller/backend/UserController.java | 4 ++-- .../api/service/impl/CourseServiceImpl.java | 14 +++++++++++--- .../service/impl/ResourceCategoryServiceImpl.java | 2 +- .../api/service/impl/ResourceServiceImpl.java | 15 +++++++++++---- .../playedu/api/service/impl/UserServiceImpl.java | 14 +++++++++++--- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java index e82978c..fb4a938 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java @@ -45,8 +45,8 @@ public class CourseController { public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); - String sortField = MapUtils.getString(params, "sort_field", "id"); - String sortAlgo = MapUtils.getString(params, "sort_algo", "desc"); + String sortField = MapUtils.getString(params, "sort_field"); + String sortAlgo = MapUtils.getString(params, "sort_algo"); String title = MapUtils.getString(params, "title"); String depIds = MapUtils.getString(params, "dep_ids"); String categoryIds = MapUtils.getString(params, "category_ids"); diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index 54d00cb..7c4de80 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java @@ -39,8 +39,8 @@ public class ResourceController { public JsonResponse index(@RequestParam HashMap params) { Integer page = MapUtils.getInteger(params, "page", 1); Integer size = MapUtils.getInteger(params, "size", 10); - String sortField = MapUtils.getString(params, "sort_field", "id"); - String sortAlgo = MapUtils.getString(params, "sort_algo", "desc"); + String sortField = MapUtils.getString(params, "sort_field"); + String sortAlgo = MapUtils.getString(params, "sort_algo"); String name = MapUtils.getString(params, "name"); String categoryIdsStr = MapUtils.getString(params, "category_ids"); diff --git a/src/main/java/xyz/playedu/api/controller/backend/UserController.java b/src/main/java/xyz/playedu/api/controller/backend/UserController.java index 49d18d8..220dbde 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/UserController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/UserController.java @@ -63,8 +63,8 @@ public class UserController { String createdAtStr = MapUtils.getString(params, "created_at"); String depIdsStr = MapUtils.getString(params, "dep_ids"); - String sortField = MapUtils.getString(params, "sort_field", "id"); - String sortAlgo = MapUtils.getString(params, "sort_algo", "desc"); + String sortField = MapUtils.getString(params, "sort_field"); + String sortAlgo = MapUtils.getString(params, "sort_algo"); UserPaginateFilter filter = new UserPaginateFilter(); filter.setSortAlgo(sortAlgo); diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java index 7f443ca..5aef9e6 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java @@ -61,10 +61,18 @@ public class CourseServiceImpl extends ServiceImpl impleme } } - if (filter.getSortAlgo().equals("desc")) { - wrapper.orderByDesc(filter.getSortField()); + String sortFiled = filter.getSortField(); + if (sortFiled == null || sortFiled.trim().length() == 0) { + sortFiled = "id"; + } + String sortAlgo = filter.getSortAlgo(); + if (sortAlgo == null || sortAlgo.trim().length() == 0) { + sortAlgo = "desc"; + } + if ("desc".equals(sortAlgo)) { + wrapper.orderByDesc(sortFiled); } else { - wrapper.orderByAsc(filter.getSortField()); + wrapper.orderByAsc(sortFiled); } IPage pageObj = new Page<>(page, size); diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java index d34ecd3..5ce9a59 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java @@ -20,7 +20,7 @@ public class ResourceCategoryServiceImpl extends ServiceImpl getByType(String type) { - return list(query().getWrapper().eq("type", type).orderByAsc("id")); + return list(query().getWrapper().eq("type", type).orderByAsc("sort")); } @Override diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java index ed76e9c..8d94c61 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java @@ -40,11 +40,18 @@ public class ResourceServiceImpl extends ServiceImpl i wrapper.in("category_id", Arrays.asList(filter.getCategoryIds())); } - // 排序 - if (filter.getSortAlgo().equals("desc")) { - wrapper.orderByDesc(filter.getSortField()); + String sortFiled = filter.getSortField(); + if (sortFiled == null || sortFiled.trim().length() == 0) { + sortFiled = "id"; + } + String sortAlgo = filter.getSortAlgo(); + if (sortAlgo == null || sortAlgo.trim().length() == 0) { + sortAlgo = "desc"; + } + if ("desc".equals(sortAlgo)) { + wrapper.orderByDesc(sortFiled); } else { - wrapper.orderByAsc(filter.getSortField()); + wrapper.orderByAsc(sortFiled); } IPage adminPage = new Page<>(page, size); diff --git a/src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java index d676850..56acb1e 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java @@ -78,10 +78,18 @@ public class UserServiceImpl extends ServiceImpl implements Us wrapper.in("id", userIds); } - if (filter.getSortAlgo().equals("desc")) { - wrapper.orderByDesc(filter.getSortField()); + String sortFiled = filter.getSortField(); + if (sortFiled == null || sortFiled.trim().length() == 0) { + sortFiled = "id"; + } + String sortAlgo = filter.getSortAlgo(); + if (sortAlgo == null || sortAlgo.trim().length() == 0) { + sortAlgo = "desc"; + } + if ("desc".equals(sortAlgo)) { + wrapper.orderByDesc(sortFiled); } else { - wrapper.orderByAsc(filter.getSortField()); + wrapper.orderByAsc(sortFiled); } IPage userPage = new Page<>(page, size);