From e27b0bed0b42e8390a3b2609339caaf67966ea84 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 31 Aug 2023 14:48:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=BE=E7=A1=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cyx/wechat/WechatController.java    | 1 -
 .../resources/mapper/base/TAmentPartyAffairsMapper.xml    | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java b/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java
index 3a0d216..afae327 100644
--- a/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java
+++ b/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java
@@ -166,7 +166,6 @@ public class WechatController extends BaseController {
         his.setDept(tAmentPartyAffairs.getDeptName());
         his.setTarget(tAmentPartyAffairs.getShotName());
         his.setCommitTime(new Date());
-        his.setDept(tAmentPartyAffairs.getDeptName());
         his.setRemark(tAmentPartyAffairs.getRemark());
         his.setFiles(tAmentPartyAffairs.getFiles());
         tAmentPartyAffairs.setStatus("2");
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 9631d39..4080ea0 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -54,9 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="type != null  and type != ''"> and a.type = #{type}</if>
             <if test="unit != null  and unit != ''"> and a.unit = #{unit}</if>
-            <if test="target != null  and target != ''">
-                AND a.target like concat('%', #{target}, '%')
-            </if>
+            <if test="unit != target  and target != ''"> and a.target = #{target}</if>
+<!--            <if test="target != null  and target != ''">-->
+<!--                AND a.target like concat('%', #{target}, '%')-->
+<!--            </if>-->
             <if test="demand != null  and demand != ''">
                 AND a.demand like concat('%', #{demand}, '%')
             </if>
@@ -125,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="perId != null "> and a.per_id = #{perId}</if>
         <if test="deptId != null "> and a.dept_id = #{deptId}</if>
         <if test="branchId != null "> and a.branch_id = #{branchId}</if>
+        order by finish_date
     </select>
 
     <select id="approveList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">