From 16bd1399dbe7fb8932a34be4ec09f289d7a09522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com> Date: Thu, 14 Nov 2024 09:31:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E5=8F=91=E5=B8=83=E6=92=A4?= =?UTF-8?q?=E9=94=80=E6=94=AF=E6=8C=81put=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 发布撤销支持put请求 --- .../com/youlai/boot/system/controller/NoticeController.java | 2 ++ .../com/youlai/boot/system/service/impl/RoleServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java index c2955ece..31e57b1b 100644 --- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java +++ b/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 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 revokeNotice( diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java index 06536630..358167cc 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java @@ -66,6 +66,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro .like(StrUtil.isNotBlank(keywords), Role::getCode, keywords) ) .ne(!SecurityUtils.isRoot(), Role::getCode, SystemConstants.ROOT_ROLE_CODE) // 非超级管理员不显示超级管理员角色 + .orderByDesc(Role::getId) ); // 实体转换 From be91043dcbe1ab2fc9b8c5d9a95eb16f861dde06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com> Date: Thu, 14 Nov 2024 09:41:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E8=A7=92=E8=89=B2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 角色列表排序更改 --- .../com/youlai/boot/system/service/impl/RoleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java index 358167cc..122fce02 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java @@ -66,7 +66,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro .like(StrUtil.isNotBlank(keywords), Role::getCode, keywords) ) .ne(!SecurityUtils.isRoot(), Role::getCode, SystemConstants.ROOT_ROLE_CODE) // 非超级管理员不显示超级管理员角色 - .orderByDesc(Role::getId) + .orderByDesc(Role::getCreateTime).orderByDesc(Role::getUpdateTime) ); // 实体转换 From 7a001ef506e588dc048c79a23e51fdecdcf34a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com> Date: Thu, 14 Nov 2024 09:42:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E5=86=97=E4=BD=99=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 冗余判断删除 --- .../com/youlai/boot/system/service/impl/RoleServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java index 122fce02..95536ce5 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/RoleServiceImpl.java @@ -61,9 +61,9 @@ public class RoleServiceImpl extends ServiceImpl implements Ro new LambdaQueryWrapper() .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)