From dbf0844fc80f5bb0c4d44a4e211789e0be09cf2c Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期四, 23 五月 2024 11:37:53 +0800
Subject: [PATCH] 产品文件相关修改
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
index 86a72d0..5f13142 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
@@ -14,6 +14,7 @@
import com.dy.pmsGlobal.pojoPlt.PltProductFile;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -128,10 +129,8 @@
private void saveRel(PltProduct p, List<PltProductFile> docs) {
docs.forEach(doc -> {
- if(doc.id == null){
- doc.proId = p.id;
- pfDao.insertSelective(doc);
- }
+ doc.proId = p.id;
+ pfDao.insertSelective(doc);
});
}
@@ -163,6 +162,9 @@
pro.proFiles.stream().forEach(doc -> {
OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
+ if (file == null) {
+ return;
+ }
FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
doc.webUrl = fileRestVo.fileWebUrl + file.filePath;
@@ -192,6 +194,11 @@
rsVo.calculateAndSet(itemTotal, params);
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
rsVo.obj = dao.selectSome(params) ;
+ if(CollectionUtils.isNotEmpty(rsVo.obj)){
+ rsVo.obj.forEach(pro->{
+ pro = addWebUrl(pro);
+ });
+ }
return rsVo ;
}
--
Gitblit v1.8.0