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 queryActSummaryDetail(@LoginUser TokenDto tokenDto,@RequestBody ActSummaryDetailFormDTO formDTO) { - formDTO.setUserId(tokenDto.getUserId()); + public Result queryActSummaryDetail(@RequestBody ActSummaryDetailFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ActSummaryFormDTO.AddUserInternalGroup.class); return new Result().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