Merge branch 'develop' into release_temp

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -23,22 +24,22 @@ public class SendNoticeFormDTO implements Serializable {
     /**
      * 用户列表
      */
-    @NotEmpty(message = "用户列表不能为空", groups = AddGroup.class)
+    @NotEmpty(message = "用户列表不能为空", groups = CustomerClientShowGroup.class)
     private List<UserListBean> userList;
     /**
      * 通知渠道通知渠道 0小程序通知，1短信通知
      */
-    @NotEmpty(message = "请选择通知渠道", groups = AddGroup.class)
+    @NotEmpty(message = "请选择通知渠道", groups = CustomerClientShowGroup.class)
     private List<String> channel;
     /**
      * 通知来源 0 行程上报，1 疫苗接种，2 核酸检测
      */
-    @NotEmpty(message = "通知来源不能为空", groups = AddGroup.class)
+    @NotEmpty(message = "通知来源不能为空", groups = CustomerClientShowGroup.class)
     private String origin;
     /**
      * 通知内容
      */
-    @Size(min = 1, max = 500, message = "通知内容不超过500字", groups = AddGroup.class)
+    @Size(min = 1, max = 500, message = "通知内容不超过500字", groups = CustomerClientShowGroup.class)
     private String content;
     /**
      * 组织名

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNoticeController.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcNoticeDTO;
@@ -72,7 +73,7 @@ public class IcNoticeController {
 
     @PostMapping("sendNotice")
     public Result sendNotice(@LoginUser TokenDto tokenDto, @RequestBody SendNoticeFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        ValidatorUtils.validateEntity(formDTO, CustomerClientShowGroup.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         icNoticeService.sendNotice(formDTO);