|
@@ -607,9 +607,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
|
|
|
SupplierInfoVo supplierInfoVo1 = baseMapper.selectVoOne(new LambdaQueryWrapper<SupplierInfo>().select(SupplierInfo::getSupplyStatus)
|
|
SupplierInfoVo supplierInfoVo1 = baseMapper.selectVoOne(new LambdaQueryWrapper<SupplierInfo>().select(SupplierInfo::getSupplyStatus)
|
|
|
.eq(SupplierInfo::getId, id));
|
|
.eq(SupplierInfo::getId, id));
|
|
|
SupplierInfoVo supplierInfoVo = new SupplierInfoVo();
|
|
SupplierInfoVo supplierInfoVo = new SupplierInfoVo();
|
|
|
- if (supplierInfoVo1.getSupplyStatus() == SupplierStatusEnum.REVIEW_UPDATED.getCode()) {
|
|
|
|
|
|
|
+ if (supplierInfoVo1 != null && supplierInfoVo1.getSupplyStatus() == SupplierStatusEnum.REVIEW_UPDATED.getCode()) {
|
|
|
SupplierInfoTemporaryVo supplierInfoTemporaryVo = supplierInfoTemporaryService.getVoOne(id);
|
|
SupplierInfoTemporaryVo supplierInfoTemporaryVo = supplierInfoTemporaryService.getVoOne(id);
|
|
|
- BeanUtils.copyProperties(supplierInfoTemporaryVo, supplierInfoVo);
|
|
|
|
|
|
|
+ if (supplierInfoTemporaryVo != null) {
|
|
|
|
|
+ BeanUtils.copyProperties(supplierInfoTemporaryVo, supplierInfoVo);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
supplierInfoVo = baseMapper.selectVoById(id);
|
|
supplierInfoVo = baseMapper.selectVoById(id);
|
|
|
}
|
|
}
|
|
@@ -2296,6 +2298,7 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
|
|
|
public int scmUpdateByBo(SupplierInfoBo bo) {
|
|
public int scmUpdateByBo(SupplierInfoBo bo) {
|
|
|
SupplierInfo update = MapstructUtils.convert(bo, SupplierInfo.class);
|
|
SupplierInfo update = MapstructUtils.convert(bo, SupplierInfo.class);
|
|
|
saveSupplierBusinessInfoFromJson(bo.getOtherCustomers(), bo.getId());
|
|
saveSupplierBusinessInfoFromJson(bo.getOtherCustomers(), bo.getId());
|
|
|
|
|
+ update.setSupplyStatus(4L);
|
|
|
return baseMapper.updateById(update);
|
|
return baseMapper.updateById(update);
|
|
|
}
|
|
}
|
|
|
|
|
|