From 9471e250a275fbd465e7e764945bb2e501dd4513 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 19 Sep 2024 11:56:23 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.18=20=E4=B8=80=E3=80=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89=20=E4=BA=8C?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89?=
 =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E7=89=88=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=84=20-=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/controller/PartProductGroupInformationController.java  | 2 ++
 .../xujie/sys/modules/part/mapper/PtmConditionItemMapper.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java b/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java
index 3bf4bfe0..cb051832 100644
--- a/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java
+++ b/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java
@@ -211,6 +211,8 @@ public class PartProductGroupInformationController {
                 ptmConditionItemData.setRecordType(data.getRecordType());
                 ptmConditionItemData.setCreateBy(data.getCreateBy());
                 ptmConditionItemData.setCreateDate(data.getCreateDate());
+                ptmConditionItemData.setTextValue(null);
+                ptmConditionItemData.setNumValue(null);
                 ptmConditionItemService.saveProductGroupPtmItem(ptmConditionItemData);
                 try {
                     ptmConditionProcessService.saveProductGroupPtmProcess(data);
diff --git a/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java b/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java
index f69cd869..cd6db42b 100644
--- a/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java
+++ b/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java
@@ -21,7 +21,7 @@ public interface PtmConditionItemMapper extends BaseMapper<PtmConditionItemData>
     List<PtmConditionItemData> searchProductGroupPtmConditionItem(PtmConditionProcessData data);
 
     @Select(
-        "SELECT item_no FROM plm_properties_item WHERE item_type = #{recordType}"
+        "SELECT item_no FROM plm_properties_item WHERE item_type = #{recordType} and site = #{site} and bu_no = #{buNo}"
     )
     List<String> searchItemNoByType(PtmConditionItemData data);
 }