Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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>
 

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);
                             }
                         }