|
@@ -185,12 +185,12 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
|
|
|
if (ObjectUtil.isNotEmpty(isRawMaterial)) {
|
|
|
if (isRawMaterial.equals(1)) {
|
|
|
//过滤有配置原材料的产品
|
|
|
- wrapper.isNotNull("pi.raw_material_id");
|
|
|
+ wrapper.eq("t1.isRawMaterial", 1);
|
|
|
//同时过滤未配置工艺的的产品
|
|
|
wrapper.isNotNull("pi.technology_id");
|
|
|
} else {
|
|
|
//过滤没原材料的产品
|
|
|
- wrapper.isNull("pi.raw_material_id");
|
|
|
+ wrapper.eq("t1.isRawMaterial", 0);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -347,9 +347,6 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
|
|
|
|
|
|
//保存产品定制信息
|
|
|
saveOrEditCustomInfo(productInfoDto);
|
|
|
- if (true) {
|
|
|
- throw new ServiceException("1111111111111111111");
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
// /**
|