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", 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);