Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -71,8 +71,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             //修改
             Mould m = mouldMapper.selectOne(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
             if ((m != null && m.getId() == mould.getId()) || m == null) {
-                Company company = companyMapper.selectById(mould.getProduceCompanyId());
-                mould.setArea(company.getCompanyAddress());
+                if(mould.getProduceCompanyId() != null){
+                    Company company = companyMapper.selectById(mould.getProduceCompanyId());
+                    mould.setArea(company.getCompanyAddress());
+                }
                 mouldMapper.updateById(mould);
             } else {
                 msg.setError("当前模具编号已存在，请重新输入其他模具编号");