diff --git a/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java b/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java index 93f54b3..7f29c6e 100644 --- a/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java +++ b/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java @@ -490,7 +490,7 @@ public class PartServiceImpl extends ServiceImpl implements IP */ private String resolveNewProductAudited(String site, String partNo) { String skipNew = baseMapper.getPartFamilySkipNew(site, partNo); - return "Y".equalsIgnoreCase(skipNew) ? "Y" : null; + return "Y".equalsIgnoreCase(skipNew) ? "Y" : "N"; } } diff --git a/src/main/resources/mapper/part/mapperXml/PartMapper.xml b/src/main/resources/mapper/part/mapperXml/PartMapper.xml index a5aa281..26353f1 100644 --- a/src/main/resources/mapper/part/mapperXml/PartMapper.xml +++ b/src/main/resources/mapper/part/mapperXml/PartMapper.xml @@ -348,10 +348,10 @@ active = 'Y', currency = #{currency}, [minOrderQty] = ISNULL(target.[minOrderQty], 0), - new_product_audited = ISNULL(#{newProductAudited}, target.new_product_audited) + new_product_audited = ISNULL(#{newProductAudited,jdbcType=VARCHAR}, ISNULL(target.new_product_audited, 'N')) WHEN NOT MATCHED THEN INSERT (site, supplier_no, part_no, active, currency, [minOrderQty], new_product_audited) - VALUES (#{site}, #{supplierNo}, #{partNo}, 'Y', #{currency}, 0, #{newProductAudited}); + VALUES (#{site}, #{supplierNo}, #{partNo}, 'Y', #{currency}, 0, ISNULL(#{newProductAudited,jdbcType=VARCHAR}, 'N'));