From 345e1e9a9b592d1c583d435d93f6e49996762850 Mon Sep 17 00:00:00 2001
From: ypsdf1 <nihaoshidifu@gitee.com>
Date: Tue, 29 Sep 2026 16:48:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20SN=E7=9B=AE=E5=BD=95=E5=BF=AB=E7=85=A7?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8A=8Aweb=5Fitem=5Fsn.cancel=5Ftime?=
 =?UTF-8?q?=E6=B8=85=E9=9B=B6=EF=BC=8C=E4=BF=9D=E7=95=99PHP=E7=AB=AF?=
 =?UTF-8?q?=E5=B7=B2=E5=86=99=E5=85=A5=E7=9A=84=E6=B3=A8=E9=94=80=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/sn.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/sn.php b/api/sn.php
index 020656d..a02cab1 100644
--- a/api/sn.php
+++ b/api/sn.php
@@ -345,7 +345,9 @@ function snPushCatalog() {
                loc_y=excluded.loc_y, loc_z=excluded.loc_z,
                container_type=excluded.container_type, in_land=excluded.in_land,
                land_name=excluded.land_name, last_seen=excluded.last_seen,
-               cancel_time=excluded.cancel_time, lost_count=excluded.lost_count,
+               cancel_time=CASE WHEN excluded.cancel_time > 0
+                                THEN excluded.cancel_time ELSE cancel_time END,
+               lost_count=excluded.lost_count,
                lost_state=excluded.lost_state, remark=excluded.remark,
                bind_reason=excluded.bind_reason, bind_time=excluded.bind_time,
                updated_at=excluded.updated_at");