From 644dea17d0f553bdd36f5bd3a6f3a946f5e033e2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:43 +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 2eb605a..2a7bdce 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
@@ -227,10 +227,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()));
@@ -238,6 +238,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);
}
@@ -630,6 +632,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());
@@ -683,12 +688,9 @@
//鏇存柊璁よ瘉鐘舵��
companyMapper.updateById(update);
}
-
}
-
}
}
-
}
// @Override
--
Gitblit v1.9.3