From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
index 603bece..fe8dd7b 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -104,7 +104,9 @@
if (optometrist!=null){
res.setOptometristName(optometrist.getName());
}
- res.setSalesUser(sysUser.getNickName());
+ if (sysUser!=null){
+ res.setSalesUser(sysUser.getNickName());
+ }
res.setOrderTime(TimeUtils.localDateTimeToString(order.getCreateTime()));
res.setAfterSalesTime(TimeUtils.localDateTimeToString(orderAftersales.getCreateTime()));
List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, order.getId()).list();
--
Gitblit v1.7.1