canrd-outside / order-erp · Commits

Commit f2e15471176a3537d04408f4af2800966968a2d1

Authored by chwork
2 parents df29b3e9 b04d4ca0
build: skipped

Merge branch 'fix-main-ch' into 'main' 

add 校验



See merge request !6
Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @f2e1547
@@ -1706,10 +1706,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -1706,10 +1706,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1706 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId())); 1706 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
1707 OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo(); 1707 OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo();
1708 if (Objects.nonNull(inspectionStageDO)) { 1708 if (Objects.nonNull(inspectionStageDO)) {
1709 -// if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) {  
1710 -//  
1711 -// }  
1712 - inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime()); 1709 + if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) {
  1710 + inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime());
  1711 + }
1713 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckComment())) { 1712 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckComment())) {
1714 inspectionStageDO.setMidCheckComment(inspectionStageInfo.getMidCheckComment()); 1713 inspectionStageDO.setMidCheckComment(inspectionStageInfo.getMidCheckComment());
1715 } 1714 }