Merge branch 'feature/mall_product'

pull/12/head
tangqian 2023-06-01 17:35:38 +08:00
commit 7f980191d1
2 changed files with 2 additions and 1 deletions

View File

@ -68,7 +68,7 @@ public class BannerController {
@PostMapping("/page") @PostMapping("/page")
@Operation(summary = "获得 Banner 分页") @Operation(summary = "获得 Banner 分页")
@PreAuthorize("@ss.hasPermission('market:banner:query')") // @PreAuthorize("@ss.hasPermission('market:banner:query')")
public CommonResult<PageResult<BannerRespVO>> getBannerPage(@RequestBody@Valid BannerPageReqVO pageVO) { public CommonResult<PageResult<BannerRespVO>> getBannerPage(@RequestBody@Valid BannerPageReqVO pageVO) {
PageResult<BannerDO> pageResult = bannerService.getBannerPage(pageVO); PageResult<BannerDO> pageResult = bannerService.getBannerPage(pageVO);
return success(BannerConvert.INSTANCE.convertPage(pageResult)); return success(BannerConvert.INSTANCE.convertPage(pageResult));

View File

@ -17,6 +17,7 @@ public interface BannerMapper extends BaseMapperX<BannerDO> {
default PageResult<BannerDO> selectPage(BannerPageReqVO reqVO) { default PageResult<BannerDO> selectPage(BannerPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<BannerDO>() return selectPage(reqVO, new LambdaQueryWrapperX<BannerDO>()
.eq(BannerDO::getTenantId,reqVO.getTenantId())
.likeIfPresent(BannerDO::getTitle, reqVO.getTitle()) .likeIfPresent(BannerDO::getTitle, reqVO.getTitle())
.eqIfPresent(BannerDO::getStatus, reqVO.getStatus()) .eqIfPresent(BannerDO::getStatus, reqVO.getStatus())
.betweenIfPresent(BannerDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(BannerDO::getCreateTime, reqVO.getCreateTime())