|
@@ -105,14 +105,14 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
|
|
|
wrapper.eq(ProductInfo::getCompanyId, dto.getCompanyId());
|
|
|
|
|
|
//过滤产品是否配置原材料
|
|
|
- Long isRawMaterial = dto.getIsRawMaterial();
|
|
|
+ Integer isRawMaterial = dto.getIsRawMaterial();
|
|
|
if (ObjectUtil.isNotEmpty(isRawMaterial)) {
|
|
|
if (isRawMaterial.equals(1)) {
|
|
|
//过滤有配置原材料的产品
|
|
|
- wrapper.isNotNull("pi.rawMaterialId");
|
|
|
+ wrapper.isNotNull("pi.raw_material_id");
|
|
|
} else {
|
|
|
- //过滤没配置原材料的产品
|
|
|
- wrapper.isNull("pi.rawMaterialId");
|
|
|
+ //过滤没原材料的产品
|
|
|
+ wrapper.isNull("pi.raw_material_id");
|
|
|
}
|
|
|
}
|
|
|
|