From 14d5bb7a15fd09b22f44ca5d767730215ce79334 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Apr 2021 14:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E5=9C=A8?= =?UTF-8?q?=E7=BB=84=E6=A8=A1=E5=BC=8F=EF=BC=88=E5=8F=91=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E3=80=81=E5=88=86=E4=BA=AB=E3=80=81=E8=AF=84=E8=AE=BA=E6=97=B6?= =?UTF-8?q?=E8=B0=83=E7=94=A8=EF=BC=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/member/form/UserAndGroupRelFormDTO.java | 1 + .../com/epmet/resi/group/dto/member/form/VisitFormDTO.java | 2 ++ .../modules/member/controller/GroupVisitorController.java | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/UserAndGroupRelFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/UserAndGroupRelFormDTO.java index c3e45edacb..a83ddd342d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/UserAndGroupRelFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/UserAndGroupRelFormDTO.java @@ -20,5 +20,6 @@ public class UserAndGroupRelFormDTO implements Serializable { @NotBlank(message = "小组ID不能为空",groups = UserAndGroupRelForm.class) private String groupId; + @NotBlank(message = "tokenDto获取userId为空",groups = UserAndGroupRelForm.class) private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/VisitFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/VisitFormDTO.java index ad68712854..acb32c589c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/VisitFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/VisitFormDTO.java @@ -23,8 +23,10 @@ public class VisitFormDTO implements Serializable { @NotBlank(message = "小组ID不能为空",groups = VisitForm.class) private String groupId; + @NotBlank(message = "tokenDto获取userId为空",groups = VisitForm.class) private String userId; + @NotBlank(message = "tokenDto获取customerId为空",groups = VisitForm.class) private String customerId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupVisitorController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupVisitorController.java index 81ad57760b..de212ce491 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupVisitorController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupVisitorController.java @@ -55,10 +55,10 @@ public class GroupVisitorController { * @date 2021/4/7 上午10:57 */ @PostMapping("visit") - public Result visit(@RequestBody VisitFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO, VisitFormDTO.VisitForm.class); + public Result visit(@RequestBody VisitFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, VisitFormDTO.VisitForm.class); return new Result().ok(groupVisitorService.visit(formDTO)); } @@ -71,8 +71,8 @@ public class GroupVisitorController { */ @PostMapping("userandgrouprel") public Result userAndGroupRel(@RequestBody UserAndGroupRelFormDTO formDTO,@LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO, UserAndGroupRelFormDTO.UserAndGroupRelForm.class); formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, UserAndGroupRelFormDTO.UserAndGroupRelForm.class); return new Result().ok(groupVisitorService.userAndGroupRel(formDTO)); }