From 083b144e0adb8a404ba0a1b92d1cc29f60b8551f Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Tue, 8 Sep 2026 09:20:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(part):=20=E4=BF=AE=E5=A4=8D=E6=96=B0?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正了PartMapper.xml中的new_product_audited字段默认值设置 - 添加了jdbcType=VARCHAR类型映射确保数据类型一致 - 修改了PartServiceImpl中resolveNewProductAudited方法的返回值逻辑 - 将null值替换为明确的'N'值避免数据库处理异常 - 确保ISNULL函数能够正确处理空值情况 --- .../com/xujie/modules/part/service/Impl/PartServiceImpl.java | 2 +- src/main/resources/mapper/part/mapperXml/PartMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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'));