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); } } });