From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 12 +++++++-----
1 files changed, 7 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 148ab94..e6dbb1f 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
@@ -225,10 +225,10 @@
List<CompanySolution> list = new ArrayList<>();
int num =0;
for(CompanySolution s :company.getSolutionList()){
- if(s.getSolutionBaseId() == null){
+ if(s.getSolution() == null || s.getSolution().getBaseId() == null ||s.getSolution().getId()==null){
continue;
}
- sIds.add(s.getSolutionBaseId());
+ sIds.add(s.getSolution().getId() );
s.setCompanyId(company.getId());
s.setIsdeleted(Constants.ZERO);
s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
@@ -236,6 +236,8 @@
s.setCreateDate(company.getCreateDate());
s.setCreator(company.getCreator());
s.setSortnum(num++);
+ s.setSolutionBaseId( s.getSolution().getId() );
+ s.setSolutionId( s.getSolution().getBaseId() );
s.setStatus(Constants.ZERO);
list.add(s);
}
@@ -628,6 +630,9 @@
for(Company company :companyList){
//鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
int status = signService.organizationAuditStatus(company.getEmail());
+ if(status == 0){
+ continue;
+ }
if(status == 1){
Company update = new Company();
update.setId(company.getId());
@@ -681,12 +686,9 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
-
}
-
}
}
-
}
// @Override
--
Gitblit v1.9.3