From ed6dc1a27e8b5e895e5840fd9848426f7649b9fe Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 6 Apr 2022 10:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E9=80=81=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/SendNoticeFormDTO.java     | 10 +++++-----
 .../java/com/epmet/controller/IcNoticeController.java  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
index fbf4bf72f9..afe1d50aa9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java
@@ -1,6 +1,6 @@
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.AddGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -23,22 +23,22 @@ public class SendNoticeFormDTO implements Serializable {
     /**
      * 用户列表
      */
-    @NotEmpty(message = "用户列表不能为空", groups = DefaultGroup.class)
+    @NotEmpty(message = "用户列表不能为空", groups = AddGroup.class)
     private List<UserListBean> userList;
     /**
      * 通知渠道通知渠道 0小程序通知，1短信通知
      */
-    @NotEmpty(message = "请选择通知渠道", groups = DefaultGroup.class)
+    @NotEmpty(message = "请选择通知渠道", groups = AddGroup.class)
     private List<String> channel;
     /**
      * 通知来源 0 行程上报，1 疫苗接种，2 核酸检测
      */
-    @NotEmpty(message = "通知来源不能为空", groups = DefaultGroup.class)
+    @NotEmpty(message = "通知来源不能为空", groups = AddGroup.class)
     private String origin;
     /**
      * 通知内容
      */
-    @Size(min = 1, max = 500, message = "通知内容不超过500字")
+    @Size(min = 1, max = 500, message = "通知内容不超过500字", groups = AddGroup.class)
     private String content;
     /**
      * 组织名
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java
index b0b8a31553..b74e7956bc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java
@@ -72,7 +72,7 @@ public class IcNoticeController {
 
     @PostMapping("sendNotice")
     public Result sendNotice(@LoginUser TokenDto tokenDto, @RequestBody SendNoticeFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         icNoticeService.sendNotice(formDTO);