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

maven

6 天以前 fc712449840c929022e5ad61102a0709c353dd63

 src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java

@@ -64,7 +64,8 @@
            if (StrUtil.isNotBlank(attachmentIds)) {
                List<SimpleFileVo> fileVos = Arrays.stream(attachmentIds.split(","))
                        .map(Long::valueOf)
                        .map(it->collectMap.getOrDefault(it, (SimpleFileVo) Collections.emptyList()))
                        .map(it->collectMap.getOrDefault(it, null))
                        .filter(Objects::nonNull)
                        .collect(Collectors.toList());
                setAttachmentList.accept(t, fileVos);
            }