From 465a0537a4803cf4e08acd06fea1c3963b54b5d3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 07 七月 2024 09:27:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |    5 ++++-
 1 files changed, 4 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 7446937..32f102c 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
@@ -66,7 +66,7 @@
             TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
             //灏嗗紓甯镐紶鍏ユ暟鎹簱
             SysError sysError = new SysError();
-            sysError.setError(Arrays.toString(e.getStackTrace()));
+            sysError.setError(e.toString());
             sysError.setFunc("saveOrder");
             sysErrorService.insert(sysError);
             saveState = false;
@@ -213,6 +213,9 @@
                     }
 
                 });
+            }else if(OrderDetails.get(i).getOtherColumns()==null){
+
+                OrderDetails.get(i).setOtherColumns("{}");
             }
         }
 

--
Gitblit v1.8.0