From b264aae2e218fe77073a4ccb4ffe64d7e19ff874 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 5 Nov 2024 14:20:27 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisTmsScanRecordServiceImpl.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 89993e7da..871bd5ed8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -2453,12 +2453,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
         if(!CollectionUtil.isEmpty(transferList)){
             listTraces.addAll(transferList);
+        }
 
+        if(!CollectionUtil.isEmpty(listTraces)) {
             //按时间从最最近排序
-            Collections.sort(listTraces, new Comparator<EmisTmsScanRecord>(){
+            Collections.sort(listTraces, new Comparator<EmisTmsScanRecord>() {
                 @Override
                 public int compare(EmisTmsScanRecord a, EmisTmsScanRecord b) {
-                    if(isAsc) {
+                    if (isAsc) {
                         if (a.getScanDate().after(b.getScanDate())) {
                             return -1;
                         } else if (a.getScanDate().before(b.getScanDate())) {
@@ -2466,7 +2468,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                         } else {
                             return 0;
                         }
-                    }else{
+                    } else {
                         if (a.getScanDate().after(b.getScanDate())) {
                             return 1;
                         } else if (a.getScanDate().before(b.getScanDate())) {
@@ -2477,8 +2479,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                     }
                 }
             });
-
         }
+
         log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
         return listTraces;
     }