From d58eaae0d1bae28c4153f71009fe071b6b95884b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 29 Jan 2026 16:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=90=8C=E6=AD=A5=E8=BF=87?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E8=BF=99=E6=9D=A1ID=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BC=96=E5=8F=B7=E8=A2=AB=E5=88=A0=E6=8E=89=E4=BA=86?=
 =?UTF-8?q?=EF=BC=88=E5=B0=B1=E6=98=AF=E7=94=B1=E9=9D=9E=E7=A9=BA=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=89=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8A=8A?=
 =?UTF-8?q?CFS=E9=87=8C=E8=BF=99=E6=9D=A1=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=A0=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/mobilebroken/admin/service/AdminDeviceService.java  | 5 ++++-
 .../nflg/mobilebroken/gongfu/service/AdminDeviceService.java | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java
index a063769f..ca8a44fb 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java
@@ -158,8 +158,8 @@ public class AdminDeviceService {
             } else if (StrUtil.isBlank(u.getProductLine5__c())) {
                 log.error("设备机型为空,{}", JSONUtil.toJsonStr(u));
             } else {
+                Device ent = deviceMap.get(u.getId());
                 if (StrUtil.isNotBlank(u.getMachine_Number__c())) {
-                    Device ent = deviceMap.get(u.getId());
                     if (Objects.nonNull(ent)) {
                         ent.setUpdateBy("crm");
                         ent.setUpdateTime(LocalDateTime.now());
@@ -239,6 +239,9 @@ public class AdminDeviceService {
                     }
                     ent.setAddress(u.getSpecificAddress__c());
                     result.add(ent);
+                }else if (Objects.nonNull(ent)){
+                    ent.setDataValidState(false);
+                    result.add(ent);
                 }
             }
         });
diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java
index 06c03849..0cb478de 100644
--- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java
+++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java
@@ -167,8 +167,8 @@ public class AdminDeviceService {
                 log.error("设备机型为空,{}", JSONUtil.toJsonStr(u));
             } else {
                 log.debug("处理设备："+u.getMachine_Number__c());
+                GongfuDevice ent = deviceMap.get(u.getId());
                 if (StrUtil.isNotBlank(u.getMachine_Number__c())) {
-                    GongfuDevice ent = deviceMap.get(u.getId());
                     if (Objects.nonNull(ent)) {
                         ent.setUpdateBy("crm");
                         ent.setUpdateTime(LocalDateTime.now());
@@ -251,6 +251,9 @@ public class AdminDeviceService {
                     ent.setAddress(u.getSpecificAddress__c());
                     ent.setDataValidState(true);
                     result.add(ent);
+                }else if (Objects.nonNull(ent)){
+                    ent.setDataValidState(false);
+                    result.add(ent);
                 }
             }
         });