From 3a279ff4b635142af278e5d02e4390d26c47f44c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 29 Apr 2021 17:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=80=BB=E7=BB=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/act/form/ActSummaryDetailFormDTO.java    | 6 ------
 .../epmet/modules/act/controller/ActSummaryController.java  | 3 +--
 .../modules/act/service/impl/ActSummaryServiceImpl.java     | 3 ++-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryDetailFormDTO.java
index 2bab9daf98..de3abf82ac 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryDetailFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActSummaryDetailFormDTO.java
@@ -19,10 +19,4 @@ public class ActSummaryDetailFormDTO implements Serializable {
     }
     @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
     private String groupActId;
-
-    /**
-     * 当前用户id
-     */
-    @NotBlank(message = "tokenDto获取userId为空", groups = ActReadViewFormDTO.AddUserInternalGroup.class)
-    private String userId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java
index dd12563508..2cb24ce356 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java
@@ -84,8 +84,7 @@ public class ActSummaryController {
      * @Date 2021/4/21 14:20
      **/
     @PostMapping("detail")
-    public Result<ActSummaryDetailResultDTO> queryActSummaryDetail(@LoginUser TokenDto tokenDto,@RequestBody ActSummaryDetailFormDTO formDTO) {
-        formDTO.setUserId(tokenDto.getUserId());
+    public Result<ActSummaryDetailResultDTO> queryActSummaryDetail(@RequestBody ActSummaryDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ActSummaryFormDTO.AddUserInternalGroup.class);
         return new Result<ActSummaryDetailResultDTO>().ok(actSummaryService.queryActSummaryDetail(formDTO));
     }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
index 69a0ca792c..ccc506b113 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
@@ -280,7 +280,8 @@ public class ActSummaryServiceImpl extends BaseServiceImpl<ActSummaryDao, ActSum
         if (null == groupActInfoEntity) {
             throw new RenException(String.format("根据groupActId:%s,查询活动信息为null", formDTO.getGroupActId()));
         }
-        ActSummaryEntity actSummaryEntity = baseDao.selectUserSummary(formDTO.getGroupActId(),formDTO.getUserId());
+        ActSummaryEntity actSummaryEntity = baseDao.selectUserSummary(formDTO.getGroupActId(),groupActInfoEntity.getPublishUserId());
+
         if (null == actSummaryEntity || groupActInfoEntity.getSummaryFlag() == NumConstant.ZERO) {
             throw new RenException(String.format("根据groupActId:%s,查询活动总结信息为null", formDTO.getGroupActId()));
         }