From e8d0bdce89ae0937763736f75868a43bd8690985 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 15:34:09 +0800
Subject: [PATCH] feat(production): 增加报工用户names支持
---
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
index 6d4d4e5..aff3da3 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
@@ -6,11 +6,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.basic.mapper.CustomerFollowUpFileMapper;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.common.vo.SimpleFileVo;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -28,10 +31,11 @@
* @since 2026/03/04 14:53
*/
@Service
-@RequiredArgsConstructor
public class CustomerFollowUpFileServiceImpl extends ServiceImpl<CustomerFollowUpFileMapper, CustomerFollowUpFile> implements CustomerFollowUpFileService {
- private final CustomerFollowUpService customerFollowUpService;
+ @Autowired
+ @Lazy
+ private CustomerFollowUpService customerFollowUpService;
@Override
@@ -64,10 +68,23 @@
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);
}
});
}
+
+ @Override
+ public SimpleFileVo getSimpleFileVoById(Long id) {
+ if(id == null){
+ return new SimpleFileVo();
+ }
+ List<CustomerFollowUpFile> followUpFilesByIds = customerFollowUpService.getFollowUpFilesByIds(Lists.newArrayList(id));
+ if(CollUtil.isEmpty(followUpFilesByIds)){
+ return new SimpleFileVo();
+ }
+ return SimpleFileVo.convert(followUpFilesByIds.get(0));
+ }
}
--
Gitblit v1.9.3