From aa73512090023e25c02d6eac3fa24c8dd9a92935 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Mon, 20 Nov 2023 17:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lihongjie/coal/notice/dto/CreateNoticeDto.java    | 2 +-
 src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java     | 2 +-
 .../java/cn/lihongjie/coal/notice/entity/NoticeEntity.java    | 2 +-
 .../java/cn/lihongjie/coal/notice/service/NoticeService.java  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

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<String> 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<NoticeEntity, NoticeRepository> {
         UserEntity sender = this.userService.get(Ctx.getUserId());
 
         List<UserEntity> 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());