Merge branch 'liweidong'

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -714,7 +714,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
                 (yieldType.equals(YieldOrderEnum.YIELD_TYPE_1.getCode())
                         || yieldType.equals(YieldOrderEnum.YIELD_TYPE_4.getCode())
                         || yieldType.equals(YieldOrderEnum.YIELD_TYPE_5.getCode()))) {
-            if (StringUtils.isBlank(part.getPlate()) || part.getArea() == 0) {
+            if (StringUtils.isBlank(part.getPlate()) || part.getArea() == null || part.getArea() == 0) {
                 yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
                 yieldOrder.setValidationTime(DateUtil.now());
                 yieldOrder.setValidationMomo("工艺匹配失败，原因：工艺镀种或面积为空");