diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java index e5f2c81..fb0dbf3 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.material.scrap.service.impl; import cn.hutool.core.util.StrUtil; +import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -23,10 +24,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; import static com.bonus.common.biz.constant.MaterialConstants.ADMIN_ID; import static com.bonus.common.biz.constant.MaterialConstants.PROVINCE_COMPANY_DEPT_ID; @@ -284,7 +282,26 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { */ @Override public List getScrapDetailsList(ToBeScrap bean) { - return scrapMapper.getScrapDetailsList(bean); + + try { + List list = scrapMapper.getScrapDetailsList(bean); + if (!list.isEmpty()) { + for (ToBeScrap toBeScrap : list) { + if (!StringHelper.isNullOrEmptyString(toBeScrap.getScrapUrl())) { + List bmFileInfos = new ArrayList<>(); + BmFileInfo fileInfo = new BmFileInfo(); + fileInfo.setFileUrl(toBeScrap.getScrapUrl()); + bmFileInfos.add(fileInfo); + toBeScrap.setBmFileInfos(bmFileInfos); + } + } + } + return list; + } catch (Exception e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } /**