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