WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into feature_dev_20221010_extend

Browse Source
This commit is contained in:
sunFlower
2022-10-18 12:00:30 +08:00
parent f011361fd7 564e231fd9
commit b4705535ec
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+3 -2
View File
@@ -214,7 +214,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
} }
/**检查车型名称id,年款号,目标市场同时存在,报错*/ /**检查车型名称id,年款号,目标市场,版本同时存在,报错*/
public void checkExitData(ProjectLibraryBase projectLibraryBase){ public void checkExitData(ProjectLibraryBase projectLibraryBase){
String projectNameId = projectLibraryBase.getProjectNameId(); String projectNameId = projectLibraryBase.getProjectNameId();
String yearNameId = projectLibraryBase.getYearNameId(); String yearNameId = projectLibraryBase.getYearNameId();
@@ -222,7 +222,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_name_id",projectNameId) queryWrapper.eq("project_name_id",projectNameId)
.eq("year_name_id",yearNameId) .eq("year_name_id",yearNameId)
.eq("target_market",targetMarket); .eq("target_market",targetMarket)
.eq("project_version",targetMarket);
if(StringUtils.isNotBlank(projectLibraryBase.getId())){ if(StringUtils.isNotBlank(projectLibraryBase.getId())){
queryWrapper.ne("id",projectLibraryBase.getId()); queryWrapper.ne("id",projectLibraryBase.getId());
} }