From 6f1ad9bcb73a415f1d45f1adc6bdeb3e80ddf95f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 05 三月 2024 09:33:39 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 8e5c03b..2ef45bc 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -153,7 +153,7 @@
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
response.setHeader("eva-download-filename", encodeFileName);
- Constants. packFilesToZip(fileList,response.getOutputStream());
+ Constants.packFilesToZip(fileList,response.getOutputStream());
} catch (IOException e) {
throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
}
@@ -227,15 +227,18 @@
List<CompanySolution> list = new ArrayList<>();
int num =0;
for(CompanySolution s :company.getSolutionList()){
- if(s.getSolutionBaseId() == null){
+ if(Objects.isNull(s.getSolution())){
continue;
}
- Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolutionBaseId())
+ if(s.getSolution().getBaseId() == null){
+ continue;
+ }
+ Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
.eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
if(Objects.isNull(newVersion)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
}
- sIds.add(s.getSolutionBaseId());
+ sIds.add(s.getSolution().getBaseId());
s.setCompanyId(company.getId());
s.setIsdeleted(Constants.ZERO);
s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
@@ -243,7 +246,7 @@
s.setCreateDate(company.getCreateDate());
s.setCreator(company.getCreator());
s.setSortnum(num++);
- s.setSolutionBaseId( s.getSolutionBaseId() );
+ s.setSolutionBaseId( s.getSolution().getBaseId() );
s.setSolutionId( newVersion.getId() );
s.setStatus(Constants.ZERO);
list.add(s);
--
Gitblit v1.9.3