|
|
@ -50,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Collections; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
@ -203,6 +204,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa |
|
|
|
vo.setCustomerSid(customerSid); |
|
|
|
vo.setUserSid(userSid); |
|
|
|
List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid); |
|
|
|
dataVos.removeAll(Collections.singleton(null)); |
|
|
|
if (dataVos.size() > 0) { |
|
|
|
for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) { |
|
|
|
String createTime = appCustomerArchivesDataVo.getCreateTime(); |
|
|
@ -212,10 +214,15 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa |
|
|
|
appCustomerArchivesDataVo.setLastUploadTime(s); |
|
|
|
String sid = appCustomerArchivesDataVo.getSid(); |
|
|
|
List<CrmFile> listVo = baseMapper.selArchivesFileImageBySid(sid); |
|
|
|
listVo.removeAll(Collections.singleton(null)); |
|
|
|
List<String> list = new ArrayList<>(); |
|
|
|
for (CrmFile crmFile : listVo) { |
|
|
|
String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); |
|
|
|
list.add(url); |
|
|
|
if(!listVo.isEmpty()){ |
|
|
|
for (CrmFile crmFile : listVo) { |
|
|
|
if(StringUtils.isNotBlank(crmFile.getFilePath())){ |
|
|
|
String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); |
|
|
|
list.add(url); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
appCustomerArchivesDataVo.setFiles(list); |
|
|
|
} |
|
|
|