提交 5cc92d08 authored 作者: hzh's avatar hzh

商品增加没有数据过滤的列表

上级 4e45677d
...@@ -103,14 +103,22 @@ public class ProductSpuController { ...@@ -103,14 +103,22 @@ public class ProductSpuController {
@SaCheckPermission("product:spu:query") @SaCheckPermission("product:spu:query")
public R<List<ProductSpuRespVO>> getSpuList(@RequestParam("spuIds") Collection<Long> spuIds) { public R<List<ProductSpuRespVO>> getSpuList(@RequestParam("spuIds") Collection<Long> spuIds) {
return R.ok(ProductSpuConvert.INSTANCE.convertForSpuDetailRespListVO( return R.ok(ProductSpuConvert.INSTANCE.convertForSpuDetailRespListVO(
productSpuService.getSpuList(spuIds), productSkuService.getSkuListBySpuId(spuIds))); productSpuService.getSpuList(spuIds), productSkuService.getSkuListBySpuId(spuIds)));
} }
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得商品 SPU 分页") @Operation(summary = "获得商品 SPU 分页")
@SaCheckPermission("product:spu:query") @SaCheckPermission("product:spu:query")
public R<PageResult<ProductSpuRespVO>> getSpuPage(@Valid ProductSpuPageReqVO pageVO) { public R<PageResult<ProductSpuRespVO>> getSpuPage(@Valid ProductSpuPageReqVO pageVO) {
PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO); PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO, true);
return R.ok(org.dromara.common.mybatis.util.BeanUtils.toBean(pageResult, ProductSpuRespVO.class));
}
@GetMapping("/all/page")
@Operation(summary = "获得商品 SPU 分页")
@SaCheckPermission("product:spu:query")
public R<PageResult<ProductSpuRespVO>> getSpuPageAll(@Valid ProductSpuPageReqVO pageVO) {
PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO, false);
return R.ok(org.dromara.common.mybatis.util.BeanUtils.toBean(pageResult, ProductSpuRespVO.class)); return R.ok(org.dromara.common.mybatis.util.BeanUtils.toBean(pageResult, ProductSpuRespVO.class));
} }
...@@ -127,7 +135,7 @@ public class ProductSpuController { ...@@ -127,7 +135,7 @@ public class ProductSpuController {
public void exportSpuList(@Validated ProductSpuPageReqVO reqVO, public void exportSpuList(@Validated ProductSpuPageReqVO reqVO,
HttpServletResponse response) { HttpServletResponse response) {
reqVO.setPageSize(PAGE_SIZE_NONE); reqVO.setPageSize(PAGE_SIZE_NONE);
List<ProductSpuDO> list = productSpuService.getSpuPage(reqVO).getList(); List<ProductSpuDO> list = productSpuService.getSpuPage(reqVO, true).getList();
ExcelUtil.exportExcel(BeanUtils.toBean(list, ProductSpuRespVO.class), "商品列表", ProductSpuRespVO.class, response); ExcelUtil.exportExcel(BeanUtils.toBean(list, ProductSpuRespVO.class), "商品列表", ProductSpuRespVO.class, response);
} }
......
...@@ -34,7 +34,7 @@ public interface ProductSpuMapper extends BaseMapperPlusPlus<ProductSpuDO, Produ ...@@ -34,7 +34,7 @@ public interface ProductSpuMapper extends BaseMapperPlusPlus<ProductSpuDO, Produ
* @param reqVO 分页请求参数 * @param reqVO 分页请求参数
* @return 商品 SPU 分页列表数据 * @return 商品 SPU 分页列表数据
*/ */
default PageResult<ProductSpuDO> selectPage(ProductSpuPageReqVO reqVO) { default PageResult<ProductSpuDO> selectPage(ProductSpuPageReqVO reqVO, Boolean dataPermission) {
Integer tabType = reqVO.getTabType(); Integer tabType = reqVO.getTabType();
LambdaQueryWrapperX<ProductSpuDO> queryWrapper = new LambdaQueryWrapperX<ProductSpuDO>() LambdaQueryWrapperX<ProductSpuDO> queryWrapper = new LambdaQueryWrapperX<ProductSpuDO>()
.likeIfPresent(ProductSpuDO::getName, reqVO.getName()) .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
...@@ -44,7 +44,7 @@ public interface ProductSpuMapper extends BaseMapperPlusPlus<ProductSpuDO, Produ ...@@ -44,7 +44,7 @@ public interface ProductSpuMapper extends BaseMapperPlusPlus<ProductSpuDO, Produ
.orderByDesc(ProductSpuDO::getId); .orderByDesc(ProductSpuDO::getId);
appendTabQuery(tabType, queryWrapper); appendTabQuery(tabType, queryWrapper);
// 设置权限 // 设置权限
if (CustomerDataPermissionHelper.isNeedFilter()) { if (dataPermission && CustomerDataPermissionHelper.isNeedFilter()) {
if (CustomerDataPermissionHelper.isNeedFilterDeptId()) { if (CustomerDataPermissionHelper.isNeedFilterDeptId()) {
queryWrapper.in(ProductSpuDO::getDeptId, CustomerDataPermissionHelper.getDeptIds()); queryWrapper.in(ProductSpuDO::getDeptId, CustomerDataPermissionHelper.getDeptIds());
} else { } else {
......
...@@ -82,10 +82,11 @@ public interface ProductSpuService { ...@@ -82,10 +82,11 @@ public interface ProductSpuService {
/** /**
* 获得商品 SPU 分页,提供给挂你兰后台使用 * 获得商品 SPU 分页,提供给挂你兰后台使用
* *
* @param pageReqVO 分页查询 * @param pageReqVO 分页查询
* @param dataPermission 是否需要过滤权限
* @return 商品spu分页 * @return 商品spu分页
*/ */
PageResult<ProductSpuDO> getSpuPage(ProductSpuPageReqVO pageReqVO); PageResult<ProductSpuDO> getSpuPage(ProductSpuPageReqVO pageReqVO, Boolean dataPermission);
/** /**
* 获得商品 SPU 分页,提供给用户 App 使用 * 获得商品 SPU 分页,提供给用户 App 使用
......
...@@ -209,8 +209,8 @@ public class ProductSpuServiceImpl implements ProductSpuService { ...@@ -209,8 +209,8 @@ public class ProductSpuServiceImpl implements ProductSpuService {
} }
@Override @Override
public PageResult<ProductSpuDO> getSpuPage(ProductSpuPageReqVO pageReqVO) { public PageResult<ProductSpuDO> getSpuPage(ProductSpuPageReqVO pageReqVO, Boolean dataPermission) {
return productSpuMapper.selectPage(pageReqVO); return productSpuMapper.selectPage(pageReqVO, dataPermission);
} }
@Override @Override
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论