From e0291b6e617c760dc2db6260309d82bb2485f570 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 8 Apr 2021 14:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E5=9C=A8?=
 =?UTF-8?q?=E7=BB=84=E6=A8=A1=E5=BC=8F=EF=BC=88=E5=8F=91=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E4=BA=AB=E3=80=81=E8=AF=84=E8=AE=BA=E6=97=B6?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=EF=BC=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/service/impl/GroupVisitorServiceImpl.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupVisitorServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupVisitorServiceImpl.java
index 7064f3ccaa..b22a79fd21 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupVisitorServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupVisitorServiceImpl.java
@@ -163,11 +163,14 @@ public class GroupVisitorServiceImpl extends BaseServiceImpl<GroupVisitorDao, Gr
             throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg());
         }
         UserAndGroupRelResultDTO result = new UserAndGroupRelResultDTO();
+        result.setPattern(GroupVisitConstant.VISIT_UNKNOWN);
         ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberService.getResiGroupMember(formDTO.getGroupId(), formDTO.getUserId());
-        if (null == resiGroupMemberDTO) {
-            result.setPattern(GroupVisitConstant.VISIT);
-        } else {
+        if (null != resiGroupMemberDTO) {
             result.setPattern(GroupVisitConstant.VISIT_IN_GROUP);
+        } else {
+            if (baseDao.selectVisitCount(formDTO.getUserId(), formDTO.getGroupId()) > NumConstant.ZERO) {
+                result.setPattern(GroupVisitConstant.VISIT);
+            }
         }
         return result;
     }