From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 4f3d29a..1a9ad90 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -165,7 +165,7 @@
 
     private String getOrderId(String dateType){
         String orderId = null;
-        if(dateType.equals("day")){
+        if(dateType==null || dateType.equals("day")){
             Integer maxOrderId = orderMapper.selectMaxOrderId();
             //鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
             String formattedNumber = String.format("%02d", maxOrderId+1);

--
Gitblit v1.8.0