From e1847e5fe5e0aeafc8f44952113c602ee8e09e97 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Fri, 12 Apr 2024 11:01:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8F=90=E7=A4=BA=E5=B7=B2=E8=AF=BB=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/api/request/ListMaterialByBannerCodeReq.java | 4 ---- .../axzo/nanopart/server/controller/MaterialController.java | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/ListMaterialByBannerCodeReq.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/ListMaterialByBannerCodeReq.java index d49c8748..2203cab5 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/ListMaterialByBannerCodeReq.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/request/ListMaterialByBannerCodeReq.java @@ -6,9 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -32,8 +30,6 @@ public class ListMaterialByBannerCodeReq { /** * 当前登录人的personId */ - @NotNull(message = "personId不能为空") - @Min(value = 1, message = "请传入正确的personId") private Long personId; /** diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/MaterialController.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/MaterialController.java index 684d40a5..226e6f05 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/MaterialController.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/MaterialController.java @@ -1,5 +1,6 @@ package cn.axzo.nanopart.server.controller; +import cn.axzo.framework.domain.ServiceException; import cn.axzo.framework.domain.web.result.ApiPageResult; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.nanopart.api.MaterialApi; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Objects; /** * @author chenwenjian @@ -65,6 +67,9 @@ public class MaterialController implements MaterialApi { @Override public ApiResult> listMaterialByBannerCode(ListMaterialByBannerCodeReq req) { String traceId = request.getHeader("traceId"); + if (Objects.isNull(req.getPersonId()) || req.getPersonId() == 0L){ + throw new ServiceException("personId不能为空"); + } return ApiResult.ok(materialService.listMaterialByBannerCode(req,traceId)); } }