From e4dc5d972374dd8eeb9b54f36e92d112493c73b8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 15:27:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/modules/split/common/FileUnZip.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
index 6b49c5eca..bd676b932 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
@@ -198,7 +198,7 @@ public class FileUnZip {
                         File[] filesTemp = fi.listFiles();
                         for (File fileTemp : filesTemp) {
                             // 对文件进行过滤
-                            if (fileTemp.getName().equals(filenameTwo) && fileTemp.getPath().contains(filenameOne) && StringUtils.isNotBlank(filenameOne)) {
+                            if (fileTemp.getName().equals(filenameTwo) && fi.getName().equals(filenameOne) && StringUtils.isNotBlank(filenameOne)) {
                                 resultlist.add(fileTemp);
                             }
                         }

From d4d359dc6baa39adeae89f5cc6f5f2b988f7a3b5 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 15:40:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=B7=BB=E5=8A=A0"?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 98d02ed0d..873d1399a 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -83,8 +83,7 @@
     <select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap">
         select *
         from params_collect_manifest
-        <include refid="BaseQuerySql"/>
-        and control_type = '11'
+        where params_manifest_id = #{paramsManifestId} and control_type = '11'
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>