From f8d94f4c0f3441c9e1e54a163d2d5395ced2ee5c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 16:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 7078489..fafbf08 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -92,7 +92,7 @@
if(StringUtils.isNotEmpty(one.getExpressResult())){
MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(one.getExpressResult(), MapTrackKD100Vo.class);
List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
- one.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
+ one.setExpress(null != data && data.size() > 0 ? data.get(0).getContext() : "");
}
return R.ok(one);
}
--
Gitblit v1.7.1