fix:产品列表接口

shiyunteng

3 天以前 b0ba33dce8487581d2bb3c49f886d158724dc44e

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java

@@ -54,7 +54,8 @@
        wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
        wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode());
        wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
        Page<Product> page1 = productService.page(page, wrapper);
      wrapper.orderByDesc(Product::getCreateTime);
        Page<Product> page1 = productService.pageByScope(page, wrapper);
        List<Product> list = page1.getRecords();
        for(Product product1 : list){
            Product  parent = productService.getById(product1.getParentId());
@@ -78,10 +79,7 @@
    @PreAuthorize("@pms.hasPermission('business_product_view')" )
    @Inner(value = false)
    public R getProductList(@ParameterObject Product product) {
        LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
      wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
      wrapper.last("limit 20");
        return R.ok(productService.list(wrapper));
        return R.ok(productService.getProductList(product));
    }

    /**
@@ -98,7 +96,7 @@
        wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
        wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
        wrapper.last("limit 30");
        return R.ok(productService.list(wrapper));
        return R.ok(productService.listByScope(wrapper));
    }

    /**