WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2022-07-13 15:44:03 +08:00
parent a813e55f09 d4d359dc6b
commit a8d45fe7c3
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+1 -2
View File
@@ -83,8 +83,7 @@
<select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap"> <select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap">
select * select *
from params_collect_manifest from params_collect_manifest
<include refid="BaseQuerySql"/> where params_manifest_id = #{paramsManifestId} and control_type = '11'
and control_type = '11'
order by del_flag desc, add_flag desc, change_flag desc, nio_number asc order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
</select> </select>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class FileUnZip {
File[] filesTemp = fi.listFiles(); File[] filesTemp = fi.listFiles();
for (File fileTemp : filesTemp) { 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); resultlist.add(fileTemp);
} }
} }