From bf0978aa5d86cce87a76e59dfe670154928c30ac Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 16 Aug 2022 09:54:49 +0800
Subject: [PATCH] =?UTF-8?q?57917=20=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E5=B8=82=E5=9C=BA=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProblemKnowledgeBaseEOServiceImpl.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index cad2b60e5..11921430d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -308,20 +308,25 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 				String targetMarket = data.getTargetMarket();
 				if(StringUtils.isNotEmpty(targetMarket) && CollectionUtils.isNotEmpty(regionList)){
+					String[] targetMarketArr = targetMarket.split(",");
 					String targetMarket_dicText = "";
 					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
 						targetMarket_dicText = regionList.stream().filter(region -> {
 							boolean flag = false;
-							if (StringUtils.equals(targetMarket, region.getValue())) {
-								flag = true;
+							for (String s : targetMarketArr) {
+								if (StringUtils.equals(s, region.getValue())) {
+									flag = true;
+								}
 							}
 							return flag;
 						}).map(DictModel::getText).collect(Collectors.joining(","));
 					}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
 						targetMarket_dicText = regionList.stream().filter(region -> {
 							boolean flag = false;
-							if (StringUtils.equals(targetMarket, region.getValue())) {
-								flag = true;
+							for (String s : targetMarketArr) {
+								if (StringUtils.equals(s, region.getValue())) {
+									flag = true;
+								}
 							}
 							return flag;
 						}).map(DictModel::getTextEn).collect(Collectors.joining(","));