Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -739,6 +739,7 @@
         FROM ic_resi_user a
         LEFT JOIN ( SELECT ID_CARD, count( id ) AS count,created_time FROM ic_nat WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD
         WHERE a.DEL_FLAG = '0'
+        and a.status = 0
         <if test="customerId != null and customerId != ''">
             AND a.CUSTOMER_ID = #{customerId}
         </if>
@@ -776,6 +777,7 @@
         FROM ic_resi_user a
         LEFT JOIN ( SELECT ID_CARD, count( id ) AS count,created_time FROM ic_vaccine WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY ID_CARD ) b ON a.ID_CARD = b.ID_CARD
         WHERE a.DEL_FLAG = '0'
+        and a.status = 0
         <if test="customerId != null and customerId != ''">
             AND a.CUSTOMER_ID = #{customerId}
         </if>