diff --git a/src/main/java/cn/lihongjie/coal/notice/dto/CreateNoticeDto.java b/src/main/java/cn/lihongjie/coal/notice/dto/CreateNoticeDto.java index 96fa1626..df781c97 100644 --- a/src/main/java/cn/lihongjie/coal/notice/dto/CreateNoticeDto.java +++ b/src/main/java/cn/lihongjie/coal/notice/dto/CreateNoticeDto.java @@ -25,5 +25,5 @@ public class CreateNoticeDto extends CommonDto { private List receivers; @Comment("是否全体") - private Boolean all; + private Boolean allUser; } diff --git a/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java b/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java index a606e383..648b07d1 100644 --- a/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java +++ b/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java @@ -30,5 +30,5 @@ public class NoticeDto extends CommonDto { @Comment("是否全体") - private Boolean all; + private Boolean allUser; } diff --git a/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java b/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java index f89bd234..3272abde 100644 --- a/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java +++ b/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java @@ -36,7 +36,7 @@ public class NoticeEntity extends CommonEntity { @Comment("是否全体") - private Boolean all; + private Boolean allUser; @OneToMany(cascade = CascadeType.REMOVE) diff --git a/src/main/java/cn/lihongjie/coal/notice/service/NoticeService.java b/src/main/java/cn/lihongjie/coal/notice/service/NoticeService.java index 732cc94e..d8571293 100644 --- a/src/main/java/cn/lihongjie/coal/notice/service/NoticeService.java +++ b/src/main/java/cn/lihongjie/coal/notice/service/NoticeService.java @@ -50,9 +50,9 @@ public class NoticeService extends BaseService { UserEntity sender = this.userService.get(Ctx.getUserId()); List users = new ArrayList<>(); - if (BooleanUtils.isTrue(request.getAll())) { + if (BooleanUtils.isTrue(request.getAllUser())) { - users = userService.findAll(); + users = userService.findAll().stream().filter(x ->! x.getId().equals(sender.getId())).collect(Collectors.toList()); }else if (request.getReceivers() != null) { users = userService.findAllByIds(request.getReceivers());