From 297abded3c5c378cd7e120ccb2a440c2a736bd64 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 18 Aug 2022 15:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=A4=B4=E5=83=8F=E6=89=8D=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiCollectServiceImpl.java   | 16 +++++++++-------
 .../impl/IcResiCollectVisitorServiceImpl.java    | 14 ++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index b2a3406576..0461ce2cba 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -189,13 +189,15 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
         // 如果是顺德居小区的人还要下放门禁
         if (formDTO.getVillageName().contains("顺德居")) {
-            formDTO.getMemberList().forEach(item->{
-                VisitVisitorFormDTO visitor = new VisitVisitorFormDTO();
-                visitor.setIdCard(item.getIdNum());
-                visitor.setMobile(item.getMobile());
-                visitor.setName(item.getName());
-                visitor.setFaceImg(item.getFaceImg());
-                dhDeviceUtil.sendAuth(visitor);
+            formDTO.getMemberList().forEach(item -> {
+                if (StringUtils.isNotBlank(item.getFaceImg())) {
+                    VisitVisitorFormDTO visitor = new VisitVisitorFormDTO();
+                    visitor.setIdCard(item.getIdNum());
+                    visitor.setMobile(item.getMobile());
+                    visitor.setName(item.getName());
+                    visitor.setFaceImg(item.getFaceImg());
+                    dhDeviceUtil.sendAuth(visitor);
+                }
             });
         }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
index 1be91e180b..2dccca05b0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
@@ -64,6 +64,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
 
     /**
      * 条件查询
+     *
      * @param params
      * @return
      */
@@ -76,6 +77,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
 
     /**
      * Desc: 查询访客信息
+     *
      * @param formDTO
      * @author wgf
      * @date 2022/8/5 8:23
@@ -83,10 +85,10 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
     @Override
     public PageData<IcResiCollectVisitorDTO> getVisitorList(VisitListFormDTO formDTO) {
         PageData<IcResiCollectVisitorDTO> result = new PageData<>(new ArrayList<>(), 0);
-        if (StringUtils.isBlank(formDTO.getStartTime()) && StringUtils.isBlank(formDTO.getEndTime()) ){
+        if (StringUtils.isBlank(formDTO.getStartTime()) && StringUtils.isBlank(formDTO.getEndTime())) {
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
-            if (null == staffInfo){
-                throw new EpmetException("查询人员信息失败"+formDTO.getUserId());
+            if (null == staffInfo) {
+                throw new EpmetException("查询人员信息失败" + formDTO.getUserId());
             }
             formDTO.setOrgId(staffInfo.getAgencyId());
         }
@@ -103,8 +105,8 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         return ConvertUtils.sourceToTarget(entityList, IcResiCollectVisitorDTO.class);
     }
 
-    private QueryWrapper<IcResiCollectVisitorEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<IcResiCollectVisitorEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IcResiCollectVisitorEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -153,7 +155,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         insert(entity);
 
         // 如果是顺德居小区的人还要下放门禁
-        if (dto.getVillageName().contains("顺德居")) {
+        if (dto.getVillageName().contains("顺德居") && StringUtils.isNotBlank(dto.getFaceImg())) {
             VisitVisitorFormDTO visitor = new VisitVisitorFormDTO();
             visitor.setMobile(dto.getMobile());
             visitor.setName(dto.getName());