From 6aa63bdde306e20032b8e8c519821244806dc47f Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 12 Aug 2022 18:38:04 +0800
Subject: [PATCH] =?UTF-8?q?57900=20=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CountryCardManageReleaseEOController.java | 5 +++--
 .../service/ICountryCardManageReleaseEOService.java      | 2 +-
 .../impl/CountryCardManageReleaseEOServiceImpl.java      | 9 ++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java
index f055b9e6e..234a61609 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java
@@ -196,8 +196,9 @@ public class CountryCardManageReleaseEOController extends JeroController<Country
 	 @AutoLog(value = "问题知识库-country_card-管理发布-获取适用市场下拉选")
 	 @ApiOperation(value="问题知识库-country_card-管理发布-获取适用市场下拉选", notes="问题知识库-country_card-管理发布-获取适用市场下拉选")
 	 @GetMapping(value = "/getApplyMarketList")
-	 public Result<List<DictModel>> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag) {
-		 Result<List<DictModel>> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag);
+	 public Result<List<DictModel>> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag,
+													   @RequestParam(name = "cut",required = true) String cut) {
+		 Result<List<DictModel>> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag,cut);
 		 return result;
 	 }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java
index 12a008567..0af88f36f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java
@@ -82,7 +82,7 @@ public interface ICountryCardManageReleaseEOService extends IService<CountryCard
 	 * 获取适用市场
 	 * @return
 	 */
-    Result<List<DictModel>> getApplyMarketList(String queryFlag);
+    Result<List<DictModel>> getApplyMarketList(String queryFlag,String cut);
 
     List<CountryCardManageReleaseEO> queryCountryCardManageReleaseByApplyMarkets(JSONObject params);
 }
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 593ddae63..c5226def4 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
@@ -3,6 +3,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
@@ -206,7 +207,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 	}
 
 	@Override
-	public Result<List<DictModel>> getApplyMarketList(String queryFlag) {
+	public Result<List<DictModel>> getApplyMarketList(String queryFlag,String cut) {
 		List<DictModel> result = new ArrayList<>();
 
 		//获取所有的适用地区
@@ -256,6 +257,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 			}
 		}
 
+		if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+			result.forEach(data -> {
+				data.setText(data.getTextEn());
+			});
+		}
+
 		return Result.OK(result);
 	}