Merge remote-tracking branch 'origin/dev_finance_20240830' into test

谢茂盛
2 parents beeb44bd f54dcd2d
Showing 1 changed file with 3 additions and 0 deletions
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
@@ -474,6 +474,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, customerCode)
                 .eq(SystemSettingDO::getRelationCode, "orderHodTime").last("limit 1"));
+        if (Objects.isNull(systemSettingDO)) {
+            return Constant.ZERO;
+        }
         String holdTime = systemSettingDO.getRelationValue();
         return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
     }