From 8befe5a2a2c06c4bfe74caf638d1d042b5a78c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 5 Mar 2022 03:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml   | 3 +++
 .../resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index 44b0a79c..b7a61b06 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -24,6 +24,9 @@
 			)
 		</if>
 		<if test="ctimeStart!=null and ctimeEnd!=null ">and ctime between #{ctimeStart} and #{ctimeEnd}</if>
+		<if test="del==null or del==''">
+			and res.del!='1'
+		</if>
     </sql>
 
 	<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
index 0373a53c..e455305b 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
@@ -64,6 +64,9 @@
 		<if test="isTpl!=null and isTpl=='1'">
 			and (res.branch_id in( #{platformBranchId},#{myBranchId}) and res.is_tpl='1')
 		</if>
+		<if test="del==null or del==''">
+			and res.del!='1'
+		</if>
     </sql>
 	<insert id="insertProcessApprova"
 			parameterType="HashMap"