tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
haoxr
2024-11-14 18:36:37 +08:00
parent 560e31a370 7a001ef506
commit 12465dcd10
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/boot/system/controller/NoticeController.java
View File

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

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

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