From 6068aa02799659b34cb4e426a4571394c02b626d Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 9 Sep 2021 16:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89userId=E4=BC=A0=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E7=94=A8token=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/GroupPointFormDTO.java | 2 -- .../main/java/com/epmet/controller/GroupPointController.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java index 641d5fbe9f..56825c39ca 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java @@ -27,8 +27,6 @@ public class GroupPointFormDTO implements Serializable { private String gridId; @NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class}) private String customerId; - @NotBlank(message = "用户ID不能为空", groups = {MyGroupRank.class}) - private String userId; /** 页码 */ private Integer pageNo = 1; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java index 82c21cefcc..91526bcc16 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java @@ -165,9 +165,9 @@ public class GroupPointController { * @date 2021.09.08 13:31:09 */ @PostMapping("grouppointranking/mygroups") - public Result> listMyGroupPointRanding(@RequestBody GroupPointFormDTO formDTO) { + public Result> listMyGroupPointRanding(@LoginUser TokenDto loginInfo, @RequestBody GroupPointFormDTO formDTO) { + String userId = loginInfo.getUserId(); ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.MyGroupRank.class); - String userId = formDTO.getUserId(); String gridId = formDTO.getGridId(); List list = bizPointTotalDetailService.listMyGroupPointRanding(userId, gridId); return new Result>().ok(list);