From a1556100d2f8d80e738b78e14f382a6a1d31df23 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 11 Nov 2024 15:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/basic/domain/BmAgreementInfo.java   | 3 ++-
 .../mapper/material/basic/BmAgreementInfoMapper.xml        | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
index 512f024e..1c763f7c 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
@@ -106,5 +106,6 @@ public class BmAgreementInfo extends BaseEntity
     @Excel(name = "是否结算", readConverterExp = "0=,结=算中,1=已结算")
     private Long isSlt;
 
-
+    @ApiModelProperty(value = "关键词")
+    private String keyWord;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
index c155daec..ecf6b6e7 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
@@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             auth_person like concat('%', #{keyWord}, '%') or
             phone like concat('%', #{keyWord}, '%'))
         </if>
-
         <if test="agreementCode != null  and agreementCode != ''">
             and bai.agreement_code like concat('%', #{agreementCode}, '%')
         </if>
@@ -51,12 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectId != null  and projectId != ''">
             and bp.pro_id = #{projectId}
         </if>
-        <if test="dataCondition != null and dataCondition.size()>0">
-            AND bai.agreement_id in
-            <foreach collection="dataCondition" item="agreementId" index="index" open="(" separator="," close=")">
-                #{agreementId}
-            </foreach>
-        </if>
         ORDER BY bai.agreement_id DESC
     </select>