获取当前在组模式（发话题、分享、评论时调用）调整

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

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

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<VisitResultDTO> visit(@RequestBody VisitFormDTO formDTO, @LoginUser TokenDto tokenDto){
-        ValidatorUtils.validateEntity(formDTO, VisitFormDTO.VisitForm.class);
+    public Result<VisitResultDTO> visit(@RequestBody VisitFormDTO formDTO, @LoginUser TokenDto tokenDto) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, VisitFormDTO.VisitForm.class);
         return new Result<VisitResultDTO>().ok(groupVisitorService.visit(formDTO));
     }
 
@@ -71,8 +71,8 @@ public class GroupVisitorController {
      */
     @PostMapping("userandgrouprel")
     public Result<UserAndGroupRelResultDTO> 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<UserAndGroupRelResultDTO>().ok(groupVisitorService.userAndGroupRel(formDTO));
     }