|
@@ -7980,17 +7980,20 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
ProjectMain projectMain=new ProjectMain();
|
|
|
projectMain.setCompanyId(thirdPartyInterface.getCompanyId());
|
|
|
projectMain.setName(project.getProjectMainName());
|
|
|
+ projectMain.setCode(project.getProjectMainCode());
|
|
|
projectMainMapper.insert(projectMain);
|
|
|
projectMainList.add(projectMain);
|
|
|
}
|
|
|
}
|
|
|
Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc ->pc.getName()!=null&& pc.getName().equals(project.getCategoryName())).findFirst();
|
|
|
- if(!category.isPresent()){
|
|
|
- ProjectCategory projectCategory=new ProjectCategory();
|
|
|
- projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
|
|
|
- projectCategory.setName(project.getCategoryName());
|
|
|
- projectCategoryMapper.insert(projectCategory);
|
|
|
- projectCategoryList.add(projectCategory);
|
|
|
+ if(project.getCategoryName()!=null){
|
|
|
+ if(!category.isPresent()){
|
|
|
+ ProjectCategory projectCategory=new ProjectCategory();
|
|
|
+ projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
|
|
|
+ projectCategory.setName(project.getCategoryName());
|
|
|
+ projectCategoryMapper.insert(projectCategory);
|
|
|
+ projectCategoryList.add(projectCategory);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
for (Project project : projectList) {
|