diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java index 0a54adb1..fe110b3a 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** @@ -47,14 +46,11 @@ public class QueryUserListRequest { * tenantId */ @JsonProperty("tenantId") - @NotNull(message = "tenantId的参数名不正确或者tenantId的值为空,请检查传入参数") - @NotBlank(message = "tenantId的参数为''字符串,请检查传入参数") private String tenantId; /** * tenantType */ @JsonProperty("tenantType") - @NotNull(message = "tenantType的参数名不正确或者tenantType的值为空,请检查传入参数") private Integer tenantType; } diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java index aa92f9b4..d0b6298d 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java @@ -268,9 +268,8 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService { param.setCurrentPage(startIndex); //查询用户列表 SysUser receiverInfo = tokenService.getLoginUser().getSysUser(); - if (receiverInfo == null) { - throw new Exception("查询不到指定的租户,receiverInfo为null,请检查传递的参数"); - } + param.setTenantId(receiverInfo.getTenantId()); + param.setTenantType(0); QueryUserListResponse queryUserListResponse = new QueryUserListResponse(); //查询出该租户拥有的所有用户列表 List userList = xhpcMessageBoardReceiveUserMapper.findAllBy(param);