diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java index 51139c0..a008280 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java @@ -153,12 +153,13 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme HashSet<String> names = new HashSet<>(); for (File file1 : files) { String name = FileUtil.getPrefix(file1.getName()); - String[] s = name.split("_"); - names.add(s[s.length - 1]); + if (name.contains(DateUtil.thisYear()+"")){ + String[] s = name.split("_"); + names.add(s[s.length - 1]); + } } names.stream() - .filter(item -> item.contains(DateUtil.thisYear() + "")) .max(String::compareTo) .ifPresent(item -> { String v = item.replace("v", "");