mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

This commit is contained in:
Jason 2022-09-15 14:15:24 +08:00
parent eea37ebba2 76e7623643
commit 220bd45e51
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java
View File

@ -19,6 +19,7 @@ import org.springframework.util.Assert;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -44,7 +45,8 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
public List<ArticleCateVo> all() { public List<ArticleCateVo> all() {
QueryWrapper<ArticleCategory> queryWrapper = new QueryWrapper<>(); QueryWrapper<ArticleCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time") 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<ArticleCategory> lists = articleCategoryMapper.selectList(queryWrapper); List<ArticleCategory> lists = articleCategoryMapper.selectList(queryWrapper);
@ -75,7 +77,8 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
QueryWrapper<ArticleCategory> queryWrapper = new QueryWrapper<>(); QueryWrapper<ArticleCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time") 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[]{ articleCategoryMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str", "like:name:str",

1
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthRoleServiceImpl.java
View File

@ -148,6 +148,7 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
SystemAuthRole model = new SystemAuthRole(); SystemAuthRole model = new SystemAuthRole();
model.setName(systemAuthRoleParam.getName().trim()); model.setName(systemAuthRoleParam.getName().trim());
model.setRemark(systemAuthRoleParam.getRemark()); model.setRemark(systemAuthRoleParam.getRemark());
model.setSort(systemAuthRoleParam.getSort());
model.setIsDisable(systemAuthRoleParam.getIsDisable()); model.setIsDisable(systemAuthRoleParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000); model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000);