From 5e4d6a9017f2cce64506ae6a2bef3e9b57c19f8a Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 30 一月 2026 10:08:43 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index 53cf813..a30fffd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -230,10 +230,15 @@
             if (StringUtils.isBlank(ruleCode)) {
                 throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
             }
-            BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
-            String stationName = stationCode.getStationName();
-            if (Cools.isEmpty(stationCode)) {
+            String stationName = null;
+            if (Cools.isEmpty(deviceSite.getDeviceCode())) {
                 stationName = station.getStationName();
+            } else {
+                BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
+                stationName = stationCode.getStationName();
+                if (Cools.isEmpty(stationCode)) {
+                    stationName = station.getStationName();
+                }
             }
             Task task = new Task();
             task.setTaskCode(ruleCode)

--
Gitblit v1.9.1