From 002ab0b9a8f24ba5da1f499524ba80f5e07f5639 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 8 Apr 2025 10:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/srq/modules/base/utils/HttpClientUtil.java   | 6 +++++-
 .../orderIssure/service/impl/IssureNotifyServiceImpl.java | 8 ++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/srq/modules/base/utils/HttpClientUtil.java b/src/main/java/com/srq/modules/base/utils/HttpClientUtil.java
index 645240e..2696ccf 100644
--- a/src/main/java/com/srq/modules/base/utils/HttpClientUtil.java
+++ b/src/main/java/com/srq/modules/base/utils/HttpClientUtil.java
@@ -298,10 +298,14 @@ public class HttpClientUtil {
                 responseData.setCode(code + "");
                 responseData.setMsg(strData);
                 responseData.setCount(resultMap.get("total") == null ? 0 : Integer.parseInt(resultMap.get("total").toString()));
-                if (code != 400) {
+                if (code != 400 && resultMap.containsKey("row")) {
                     String objString = String.valueOf(resultMap.get("row"));
                     responseData.setObj(objString);
                 }
+                if (code != 400 && resultMap.containsKey("rows")) {
+                    String objString = String.valueOf(resultMap.get("rows"));
+                    responseData.setObj(objString);
+                }
             } else {
                 responseData.setCode(statusCode + "");
                 responseData.setMsg("错误码：" + statusCode);
diff --git a/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
index 2c8dc1b..a408c49 100644
--- a/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
+++ b/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
@@ -16,11 +16,7 @@ import com.srq.modules.base.utils.HttpClientUtil;
 import com.srq.modules.base.utils.ResponseData;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -164,6 +160,6 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
         }
         String rows = result.getObj().toString();
 //        List<Map> list = JSON.parseArray(rows, Map.class);
-        return JSON.parseArray(rows, PickDetail.class);
+        return Optional.ofNullable(JSON.parseArray(rows, PickDetail.class)).orElse(Collections.emptyList());
     }
 }