From d40baa4b8cef48e8457e0741bc5cff797b73b3c9 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Fri, 25 Aug 2023 14:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/base/affairs/day.html    | 2 +-
 .../src/main/resources/templates/base/affairs/year.html   | 2 +-
 .../resources/mapper/base/TAmentPartyAffairsMapper.xml    | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html
index 6ee9f11..8460bb9 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -21,7 +21,7 @@
                             </li>
                             <li>
                                 <label>考核目标：</label>
-                                <input type="text" name="method"/>
+                                <input type="text" name="demand"/>
                             </li>
 <!--                            <li>-->
 <!--                                <label>负责人：</label>-->
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index fe8cd27..1b4def5 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -21,7 +21,7 @@
                         </li>
                         <li>
                             <label>考核目标：</label>
-                            <input type="text" name="method"/>
+                            <input type="text" name="demand"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 5cad111..da8ce1a 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -35,8 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="target != null  and target != ''"> and target = #{target}</if>
-            <if test="demand != null  and demand != ''"> and demand = #{demand}</if>
+            <if test="target != null  and target != ''">
+                AND target like concat('%', #{target}, '%')
+            </if>
+            <if test="demand != null  and demand != ''">
+                AND demand like concat('%', #{demand}, '%')
+            </if>
             <if test="detailed != null  and detailed != ''"> and detailed = #{detailed}</if>
             <if test="score != null  and score != ''"> and score = #{score}</if>
             <if test="method != null  and method != ''"> and method = #{method}</if>