From 564e231fd9b00d7b3486b391631f4210e953a4a6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 18 Oct 2022 12:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E9=AA=8C=E8=AF=81=E8=BD=A6=E5=9E=8B=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?id,=E5=B9=B4=E6=AC=BE=E5=8F=B7,=E7=9B=AE=E6=A0=87=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA,=E7=89=88=E6=9C=AC=E5=90=8C=E6=97=B6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index ebbb75150..fd4db6a50 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -214,7 +214,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	}
 
 
-	/**检查车型名称id,年款号,目标市场同时存在,报错*/
+	/**检查车型名称id,年款号,目标市场,版本同时存在,报错*/
 	public void checkExitData(ProjectLibraryBase projectLibraryBase){
 		String projectNameId = projectLibraryBase.getProjectNameId();
 		String yearNameId = projectLibraryBase.getYearNameId();
@@ -222,7 +222,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("project_name_id",projectNameId)
 				.eq("year_name_id",yearNameId)
-				.eq("target_market",targetMarket);
+				.eq("target_market",targetMarket)
+				.eq("project_version",targetMarket);
 		if(StringUtils.isNotBlank(projectLibraryBase.getId())){
 			queryWrapper.ne("id",projectLibraryBase.getId());
 		}