From 9e62ce02f704f5bd2a820eef544a4f7f98bccf99 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 16 Aug 2022 15:34:02 +0800
Subject: [PATCH] =?UTF-8?q?57874=20=E7=94=A8=E6=88=B7=E8=BF=9B=E5=85=A5cou?=
 =?UTF-8?q?ntryCard=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=87=AA=E5=B7=B1=E8=83=BD=E7=AD=9B=E9=80=89=E7=9A=84?=
 =?UTF-8?q?=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/problemKnowledgeBase/enums/QueryFlagEnum.java   | 2 +-
 .../service/impl/CountryCardManageReleaseEOServiceImpl.java | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java
index ec1a9448c..03682f71a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/QueryFlagEnum.java
@@ -11,7 +11,7 @@ public enum QueryFlagEnum {
     GET_ALL_APPLY_MARKET("获取所有的适用市场","","0"),
     GET_NOT_CREATE_APPLY_MARKET("获取还没有创建过countryCard的适用市场","","1"),
     GET_RELEASED_APPLY_MARKET("获取已发布的countryCard的适用市场","","2"),
-    GET_CREATE_APPLY_MARKET("获取所有已创建的countryCard的适用市场","","3"),
+    GET_CREATE_APPLY_MARKET("获取所有自己已创建的countryCard的适用市场","","3"),
     ;
 
     String cnName;
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 8e211b19a..2dc1c22fc 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
@@ -6,6 +6,7 @@ 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.common.system.vo.LoginUser;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryNationalFlagEO;
@@ -19,6 +20,7 @@ import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -257,13 +259,15 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 				}
 			}
 		}else if(StringUtils.equals(queryFlag,QueryFlagEnum.GET_CREATE_APPLY_MARKET.getValue())){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){
 				result = null;
 			}else {
 				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.getCreateBy(),currentUser.getUsername())){
 							flag = true;
 							break;
 						}