From e7fcddb3614d06462c79dda2026ba28b99d9cac9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 8 Apr 2021 13:51:42 +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

---
 .../service/impl/GroupVisitorServiceImpl.java | 24 ++++++++++++-------
 .../mapper/member/ResiGroupMemberDao.xml      |  2 +-
 2 files changed, 17 insertions(+), 9 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 662505859e..7064f3ccaa 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
@@ -22,16 +22,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.member.dao.GroupVisitRecordDao;
 import com.epmet.modules.member.dao.GroupVisitorDao;
-import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.entity.GroupVisitRecordEntity;
 import com.epmet.modules.member.entity.GroupVisitorEntity;
 import com.epmet.modules.member.service.GroupVisitorService;
+import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.resi.group.constant.GroupVisitConstant;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.member.GroupVisitorDTO;
+import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.form.UserAndGroupRelFormDTO;
 import com.epmet.resi.group.dto.member.form.VisitFormDTO;
 import com.epmet.resi.group.dto.member.result.GroupInfoResultDTO;
@@ -58,8 +63,9 @@ public class GroupVisitorServiceImpl extends BaseServiceImpl<GroupVisitorDao, Gr
     @Autowired
     private GroupVisitRecordDao groupVisitRecordDao;
     @Autowired
-    private ResiGroupMemberDao resiGroupMemberDao;
-
+    private ResiGroupService resiGroupService;
+    @Autowired
+    private ResiGroupMemberService resiGroupMemberService;
     @Override
     public PageData<GroupVisitorDTO> page(Map<String, Object> params) {
         IPage<GroupVisitorEntity> page = baseDao.selectPage(
@@ -152,14 +158,16 @@ public class GroupVisitorServiceImpl extends BaseServiceImpl<GroupVisitorDao, Gr
      */
     @Override
     public UserAndGroupRelResultDTO userAndGroupRel(UserAndGroupRelFormDTO formDTO) {
-        Integer userInGroup = resiGroupMemberDao.checkUserInGroup(formDTO.getUserId(), formDTO.getGroupId());
+        ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
+        if (null == resiGroupDTO) {
+            throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg());
+        }
         UserAndGroupRelResultDTO result = new UserAndGroupRelResultDTO();
-        if (NumConstant.ZERO == userInGroup){
+        ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberService.getResiGroupMember(formDTO.getGroupId(), formDTO.getUserId());
+        if (null == resiGroupMemberDTO) {
             result.setPattern(GroupVisitConstant.VISIT);
-        }else if (NumConstant.ZERO < userInGroup){
+        } else {
             result.setPattern(GroupVisitConstant.VISIT_IN_GROUP);
-        }else {
-            result.setPattern(GroupVisitConstant.VISIT_UNKNOWN);
         }
         return result;
     }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 183de49bad..620bac3066 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -162,7 +162,7 @@
         WHERE DEL_FLAG = '0'
           AND CUSTOMER_USER_ID = #{userId}
           AND RESI_GROUP_ID = #{groupId}
-          AND `STATUS` = 'approved'
+          AND `STATUS` != 'removed'
     </select>
 
     <!-- 修改群成员关系数据状态 -->