From 4c955751f78be79478bda2c61ec7128ec8939509 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 17 七月 2024 11:38:43 +0800 Subject: [PATCH] 代码提交 --- server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 24 ++++++------------------ 1 files changed, 6 insertions(+), 18 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java index e081da9..1362ac7 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java @@ -51,10 +51,12 @@ || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } - if(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU) - ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING) + if(!(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN) - ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)){ + ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE) + ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CAROUSEL_AD) + ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.VIDEO_REC) + ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.REAL_CASE))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍒嗙被淇℃伅閿欒"); } return zbomZhongTaiService.getCatalogList(ztCatalogListRequest); @@ -66,12 +68,6 @@ if(Objects.isNull(ztCatalogListRequest) || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); - } - if(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU) - ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING) - ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN) - ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍒嗙被淇℃伅閿欒"); } return zbomZhongTaiService.getTagList(ztCatalogListRequest); } @@ -121,9 +117,7 @@ || Objects.isNull(ztContentListRequest.getPageNum()) || Objects.isNull(ztContentListRequest.getPageSize()) || StringUtils.isBlank(ztContentListRequest.getCatalogCode()) - || StringUtils.isBlank(ztContentListRequest.getTagCodes()) - || StringUtils.isBlank(ztContentListRequest.getQuery()) - || StringUtils.isBlank(ztContentListRequest.getSortType()) +// || StringUtils.isBlank(ztContentListRequest.getTagCodes()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } @@ -132,12 +126,6 @@ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType()); ztContentListRequest.setToken(ztBaseInfoResponse.getToken()); String catalogCode = ztContentListRequest.getCatalogCode(); - if(catalogCode.equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU) - ||catalogCode.equals(ZTConstants.CatalogCode.CHANPING) - ||catalogCode.equals(ZTConstants.CatalogCode.ZIXUN) - ||catalogCode.equals(ZTConstants.CatalogCode.QW_CASE)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍒嗙被淇℃伅閿欒"); - } ZTBasePageResponse<ZTContentListResponse> response = zbomZhongTaiService.pageContentList(ztContentListRequest); return response; } -- Gitblit v1.9.3