From 5bc7a8c52a50b50f679f6da2c5a57f01d17ec30c Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 15 Sep 2022 11:49:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/article/impl/ArticleCategoryServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java index ad891cc0..f3bc0dd8 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.util.Assert; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -44,7 +45,8 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { public List all() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time") - .eq("is_delete", 0); + .eq("is_delete", 0) + .orderByDesc(Arrays.asList("sort", "id")); List lists = articleCategoryMapper.selectList(queryWrapper); @@ -75,7 +77,8 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time") - .eq("is_delete", 0); + .eq("is_delete", 0) + .orderByDesc(Arrays.asList("sort", "id")); articleCategoryMapper.setSearch(queryWrapper, params, new String[]{ "like:name:str", From 76e7623643f79f9682f2f3f263f97a6e6e6ea84a Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 15 Sep 2022 11:58:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=97=B6=E6=8E=92=E5=BA=8F=E5=8F=B7=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java index b83f05b4..14e791a6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java @@ -148,6 +148,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService { SystemAuthRole model = new SystemAuthRole(); model.setName(systemAuthRoleParam.getName().trim()); model.setRemark(systemAuthRoleParam.getRemark()); + model.setSort(systemAuthRoleParam.getSort()); model.setIsDisable(systemAuthRoleParam.getIsDisable()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000);