Pre Merge pull request !325 from enkang/4.X

This commit is contained in:
enkang 2023-03-31 01:33:57 +00:00 committed by Gitee
commit 89ed3226cc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -70,7 +70,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
.like(StringUtils.isNotBlank(role.getRoleKey()), "r.role_key", role.getRoleKey()) .like(StringUtils.isNotBlank(role.getRoleKey()), "r.role_key", role.getRoleKey())
.between(params.get("beginTime") != null && params.get("endTime") != null, .between(params.get("beginTime") != null && params.get("endTime") != null,
"r.create_time", params.get("beginTime"), params.get("endTime")) "r.create_time", params.get("beginTime"), params.get("endTime"))
.orderByAsc("r.role_sort"); .orderByAsc("r.role_sort").orderByAsc("r.crete_time");
return wrapper; return wrapper;
} }