|
@@ -217,7 +217,9 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
|
|
} else {
|
|
} else {
|
|
MouldVO mould = mouldMapper.getDetailById(mouldVO);
|
|
MouldVO mould = mouldMapper.getDetailById(mouldVO);
|
|
InjectionMolding molding = injectionMoldingMapper.selectOne(new QueryWrapper<InjectionMolding>().eq("mould_id", mouldVO.getId()));
|
|
InjectionMolding molding = injectionMoldingMapper.selectOne(new QueryWrapper<InjectionMolding>().eq("mould_id", mouldVO.getId()));
|
|
- mould.setInjectionMolding(molding);
|
|
|
|
|
|
+ if(null != molding){
|
|
|
|
+ mould.setInjectionMolding(molding);
|
|
|
|
+ }
|
|
map.put("vo", mould);
|
|
map.put("vo", mould);
|
|
ProjectVO vo = projectMapper.getProjectById(mould.getProjectId());
|
|
ProjectVO vo = projectMapper.getProjectById(mould.getProjectId());
|
|
if (null == mould.getProjectId()) {
|
|
if (null == mould.getProjectId()) {
|