From fe74e27ec7611ad8ffa552e97d1c23b222f21c8b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 03 Mar 2021 19:58:35 +0800
Subject: [PATCH] 20210321  常用类别设置

---
 src/main/resources/mapper/modules/ContractOrderMapper.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index 2fce0ff..7436b9c 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -103,14 +103,6 @@
 		LEFT JOIN member m ON m.id = s.member_id
 		<where>
 		s.closing_type in (2,3,4,5,6,7,8,9)
-		AND s.member_id IN (
-			SELECT
-				id
-			FROM
-				member
-			WHERE
-				account_type = '1'
-		)
 			<if test="record != null" >
                 <if test="record.account!=null and record.account!=''">
                     and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
@@ -118,6 +110,12 @@
                 <if test="record.closingType!=null and record.closingType!=''">
                     and s.closing_type = #{record.closingType}
                 </if>
+				<if test="record.accountType!=null and record.accountType!=''">
+					and m.account_type = #{record.accountType}
+				</if>
+				<if test="record.contractType!=null and record.contractType!=''">
+					and s.contract_type = #{record.contractType}
+				</if>
             </if>
 		</where>
 			order by s.opening_time desc

--
Gitblit v1.9.1