From 67b311d76954eca9e7f0ae28077e4b1c255adea2 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 30 Mar 2022 10:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java   | 6 +++++-
 .../src/main/java/com/epmet/controller/IcNatController.java | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
index eb43d0ddd9..b67375b5c5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -20,10 +21,13 @@ public class AddIcNatFormDTO implements Serializable {
 
     public interface Nat extends CustomerClientShowGroup {
     }
+    public interface Edit extends CustomerClientShowGroup {
+    }
 
     /**
      * 核酸记录Id,修改时使用
      */
+    @NotBlank(message = "组织Id不能为空", groups = Edit.class)
     private String icNatId;
     /**
      * 当前网格所属组织Id
@@ -57,7 +61,7 @@ public class AddIcNatFormDTO implements Serializable {
     /**
      * 检测时间
      */
-    //@NotBlank(message = "检测时间不能为空", groups = Nat.class)
+    @NotNull(message = "检测时间不能为空", groups = Nat.class)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm")
     private Date natTime;
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
index 1c82388e65..d6ff6b6af7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
@@ -122,6 +122,7 @@ public class IcNatController implements ResultDataResolver {
     @NoRepeatSubmit
     @PostMapping("edit")
     public Result edit(@LoginUser TokenDto tokenDto, @RequestBody AddIcNatFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddIcNatFormDTO.Edit.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         icNucleinService.edit(formDTO);