From 8b79ca975961b1fe65a6ace5be3a643ab5d23938 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 31 Aug 2023 17:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/base/affairs/finishedstatic.html   | 2 ++
 .../src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index c7eeaeb..1992551 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -82,6 +82,8 @@
         var prefix = ctx + "base/affairs";
         if(window.parent.parent){
             $("#type0831").val(window.parent.parent._tab_name)
+        }else {
+            $("#type0831").val('')
         }
         $(function() {
             var options = {
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 1ba5282..597596e 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -271,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id
         LEFT JOIN sys_dept f ON a.dept_id = f.dept_id
         where
-        <if test="type != null  and type != ''"> and a.type = #{type}</if>
+        <if test="type != null  and type != ''"> a.type = #{type}</if>
         GROUP BY
             a.type,
             a.shot_name