rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod/20260130' into develop 

# Conflicts:
#	nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java
This commit is contained in:
曹鹏飞 2026-01-29 16:57:28 +08:00
parent 1a59b8ef62 d58eaae0d1
commit 44ca42144c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java
View File

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

5
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java
View File

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