Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

src/main/java/com/youlai/boot/system/controller/NoticeController.java

@@ -84,6 +84,7 @@ public class NoticeController {
 
     @Operation(summary = "发布通知公告")
     @PatchMapping(value = "/{id}/publish")
+    @PutMapping(value = "/{id}/publish")
     @PreAuthorize("@ss.hasPerm('sys:notice:publish')")
     public Result<Void> publishNotice(
             @Parameter(description = "通知公告ID") @PathVariable Long id
@@ -93,6 +94,7 @@ public class NoticeController {
     }
 
     @Operation(summary = "撤回通知公告")
+    @PutMapping(value = "/{id}/revoke")
     @PatchMapping(value = "/{id}/revoke")
     @PreAuthorize("@ss.hasPerm('sys:notice:revoke')")
     public Result<Void> revokeNotice(

src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java

@@ -61,11 +61,12 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
                 new LambdaQueryWrapper<Role>()
                         .and(StrUtil.isNotBlank(keywords),
                                 wrapper ->
-                                        wrapper.like(StrUtil.isNotBlank(keywords), Role::getName, keywords)
+                                        wrapper.like(Role::getName, keywords)
                                                 .or()
-                                                .like(StrUtil.isNotBlank(keywords), Role::getCode, keywords)
+                                                .like(Role::getCode, keywords)
                         )
                         .ne(!SecurityUtils.isRoot(), Role::getCode, SystemConstants.ROOT_ROLE_CODE) // 非超级管理员不显示超级管理员角色
+                        .orderByDesc(Role::getCreateTime).orderByDesc(Role::getUpdateTime)
         );
 
         // 实体转换