From 6d22c08a5bb9a37368b580b5cc67e6ce1b073d29 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 25 Apr 2021 17:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=9F=A5=E7=9C=8B=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/act/result/ActDetailByLinkResultDTO.java    | 5 +++++
 .../act/service/impl/ActSignInRecordServiceImpl.java      | 4 ++--
 .../modules/act/service/impl/GroupActInfoServiceImpl.java | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java
index 8ee28cadb6..d20dd5ce76 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailByLinkResultDTO.java
@@ -10,5 +10,10 @@ import lombok.Data;
  */
 @Data
 public class ActDetailByLinkResultDTO extends ActDetailResultDTO{
+    /**
+     * 在组内:yes；不在组内：no
+     */
+    private String inGroup;
+
     private String invitationRecordId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
index 75e5d86772..d3657b29cb 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
@@ -284,6 +284,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
         if (null != actSignInCodeDTO) {
             resultDTO.setSignInCodeUrl(actSignInCodeDTO.getUrl());
         } else {
+            GroupActInfoDTO groupActInfoDTO=groupActInfoService.getGroupActInfoDTO(actSignInCodeDTO.getGroupActId());
             //获取AccessToken
             String accessToken = ThirdUtils.getAccessToken(formDTO.getCustomerId()).getResiToken();
             if (StringUtils.isBlank(accessToken)) {
@@ -291,9 +292,8 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
                 throw new RenException("获取accessToken失败，customerId:{}", formDTO.getCustomerId());
             }
             //跳转的页面
-            //todo
             StringBuilder path = new StringBuilder(ModuleConstant.GROUP_ACT_DETAIL_PAGE);
-            path.append("?groupActId=").append(formDTO.getGroupActId());
+            path.append("?groupActId=").append(formDTO.getGroupActId()).append("&groupId=").append(groupActInfoDTO.getGroupId());
 
             //需要发送的Json
             JSONObject data = new JSONObject();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 0274790383..a658d14c1f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -775,6 +775,14 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             log.warn("invitation_record is null  invitationRecordId=" + formDTO.getInvitationRecordId());
             throw new RenException(EpmetErrorCode.INVITATION_NOT_EXIST.getCode(), EpmetErrorCode.INVITATION_NOT_EXIST.getMsg());
         }
+        //当前内容仅允许组内成员查看
+        ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberService.getResiGroupMember(invitationRecordDTO.getGroupId(),formDTO.getUserId());
+        if(null==resiGroupMemberDTO){
+            ActDetailByLinkResultDTO resultDTO=new ActDetailByLinkResultDTO();
+            resultDTO.setInGroup(Constant.NO);
+            resultDTO.setInvitationRecordId(formDTO.getInvitationRecordId());
+            return resultDTO;
+        }
         ActDetailFormDTO actDetailFormDTO = new ActDetailFormDTO();
         actDetailFormDTO.setUserId(formDTO.getUserId());
         actDetailFormDTO.setGroupActId(invitationRecordDTO.getSourceId());