From f206132b26d730ddb26ef4c630a17503dfdfc06f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 7 Jul 2022 17:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E5=90=8D=E5=8D=95=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/CancelAttentionPackageFormDTO.java    | 5 ++++-
 .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java  | 4 ++--
 .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java
index 6867827cd4..a059d76680 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionPackageFormDTO.java
@@ -22,7 +22,7 @@ public class CancelAttentionPackageFormDTO implements Serializable {
     /**
      * 身份证
      */
-    @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class)
+//    @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class)
     private List<String> idCards;
 
     /**
@@ -30,4 +30,7 @@ public class CancelAttentionPackageFormDTO implements Serializable {
      */
     @NotNull(message = "attentionType不能为空",groups = CancelAttentionPackageForm.class)
     private Integer attentionType ;
+
+    @NotNull(message = "ids不能为空",groups = CancelAttentionPackageForm.class)
+    private List<String> ids;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index 6175e742c5..5c36cb1eb2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -289,8 +289,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void cancelAttention(CancelAttentionPackageFormDTO formDTO) {
-        if (CollectionUtils.isNotEmpty(formDTO.getIdCards())){
-            baseDao.cancelAttention(formDTO.getIdCards(), formDTO.getAttentionType());
+        if (CollectionUtils.isNotEmpty(formDTO.getIds())){
+            baseDao.cancelAttention(formDTO.getIds(), formDTO.getAttentionType());
         }
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
index c6249ea224..29a68a7529 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@@ -11,7 +11,7 @@
             del_flag = 1
         WHERE del_flag = 0
           AND attention_type = #{attentionType}
-          AND id_card IN (
+          AND id IN (
               <foreach collection="list" item="l" separator=",">
                   #{l}
               </foreach>