From 566bff9566ce250b5872adf39f994273dca82609 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sun, 17 Sep 2023 22:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A9=BF=E6=A2=AD=E6=A1=86bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProRouteProductServiceImpl.java          | 1 +
 .../resources/mapper/technology/ProRouteProductMapper.xml | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProductServiceImpl.java b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProductServiceImpl.java
index bdcd89cc..5e986bed 100644
--- a/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProductServiceImpl.java
+++ b/op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteProductServiceImpl.java
@@ -126,6 +126,7 @@ public class ProRouteProductServiceImpl implements IProRouteProductService {
 		List<ProRouteProduct> dto = proRouteProductMapper.getRouteProdProductListUndo(proRouteProduct);
 		List<ProRouteProduct> selected= proRouteProductMapper.getRouteProdProductListDo(proRouteProduct);
 		dto.addAll(selected);
+
 		dto.forEach(item -> {
 			item.setKey(item.getItemCode());
 		});
diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProductMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProductMapper.xml
index eaf74631..3d73959c 100644
--- a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProductMapper.xml
+++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteProductMapper.xml
@@ -58,6 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   bp.product_id itemId
 		from base_product bp
 		where bp.active_flag = '1' and bp.del_flag = '0'
+		and bp.product_code not in (
+		    select pp.item_code
+			from pro_route_product pp
+			where pp.route_id = #{routeId}
+		)
+		<if test="itemName != null  and itemName != ''"> and bp.product_desc_zh like concat('%', #{itemName}, '%')</if>
+
 	</select>
 
 <!--	<select id="getRouteProdProductListDo" resultType="com.op.technology.domain.ProRouteProduct">-->
@@ -74,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from pro_route_product pp
 		left join base_product bp on pp.item_code = bp.product_code
 		where pp.route_id = #{routeId}
+		<if test="itemName != null  and itemName != ''"> and bp.product_desc_zh like concat('%', #{itemName}, '%')</if>
 	</select>
 
 	<insert id="insertProRouteProduct" parameterType="ProRouteProduct">