活动总结详情bug修改

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;
 }

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));
     }

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()));
         }