From 321f9f594f661ee2636dc1acd85030109c1e4d6c Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 10 Aug 2022 09:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?=
 =?UTF-8?q?=E8=81=94=E8=B0=83=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CountryCardManageReleaseEOServiceImpl.java    | 3 ++-
 .../service/impl/CountryCardTempEOServiceImpl.java             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java
index 0345c59cc..e7252d647 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java
@@ -235,7 +235,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 				for (DictModel dictModel : dictModelList) {
 					boolean flag = false;
 					for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) {
-						if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){
+						if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())
+						&&StringUtils.equals(countryCardManageReleaseEO.getReleaseStatus(),ReleaseStatusEnum.HAVE_RELEASED.getValue())){
 							flag = true;
 							break;
 						}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java
index 8bb1d4c49..43086bc37 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java
@@ -70,6 +70,7 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl<CountryCardTempEOM
 				CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO = new CountryCardManageReleaseDetailEO();
 				countryCardManageReleaseDetailEO.setCountryCardTempId(countryCardTempEO.getId());
 				countryCardManageReleaseDetailEO.setCountryCardManageReleaseId(manageReleaseEO.getId());
+				releaseDetailEOList.add(countryCardManageReleaseDetailEO);
 			});
 			this.countryCardManageReleaseDetailEOService.saveBatch(releaseDetailEOList);
 		}