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

Merge branch 'feature/bug-1286' into develop

This commit is contained in:
曹鹏飞 2026-02-03 10:46:14 +08:00
parent c52f86f85a d6a1074a79
commit 19e37daaaf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java
View File

@ -582,7 +582,7 @@ public class DeviceController extends ControllerBase {
if (Objects.isNull(dto.getId())) {
sb.append("id不能为空;");
}else {
device = dbDevices.stream().filter(d -> d.getId().equals(dto.getId())).findFirst().orElse(null);
device = dbDevices.stream().filter(d -> d.getId().toString().equals(dto.getId())).findFirst().orElse(null);
if (Objects.isNull(device)) {
sb.append("设备不存在;");
device = new Device();

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceUpdateImportDTO.java
View File

@ -14,5 +14,5 @@ public class DeviceUpdateImportDTO extends DeviceAddImportDTO{
* id
*/
@ExcelColumn("id*")
private Integer id;
private String id;
}

2
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
View File

@ -596,7 +596,7 @@ public class DeviceController extends ControllerBase {
if (Objects.isNull(dto.getId())) {
sb.append("id不能为空;");
} else {
device = dbDevices.stream().filter(d -> d.getId().equals(dto.getId())).findFirst().orElse(null);
device = dbDevices.stream().filter(d -> d.getId().toString().equals(dto.getId())).findFirst().orElse(null);
if (Objects.isNull(device)) {
sb.append("设备不存在;");
device = new GongfuDevice();

2
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/dto/DeviceUpdateImportDTO.java
View File

@ -14,5 +14,5 @@ public class DeviceUpdateImportDTO extends DeviceAddImportDTO {
* id
*/
@ExcelColumn("id*")
private Long id;
private String id;
}