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:41:31 +08:00
parent 3fb86a4565 634a245b3d
commit c52f86f85a
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,10 +613,6 @@ public class DeviceController extends ControllerBase {
sb.append("设备状态无效;"); sb.append("设备状态无效;");
} else { } else {
device.setDeviceState(state.getId()); device.setDeviceState(state.getId());
if (StrUtil.isNotBlank(dto.getDeviceNo()) && StrUtil.equals(state.getCode(), "Normal")
&& deviceService.lambdaQuery().ne(Device::getId, device.getId()).eq(Device::getDeviceNo, dto.getDeviceNo()).eq(Device::getDeviceState, state.getId()).exists()) {
sb.append("设备已存在;");
}
} }
} }
device.setCustomerId(0); device.setCustomerId(0);

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

@ -631,15 +631,6 @@ public class DeviceController extends ControllerBase {
sb.append("设备状态无效;"); sb.append("设备状态无效;");
} else { } else {
device.setDeviceState(state.getId()); device.setDeviceState(state.getId());
if (StrUtil.isNotBlank(dto.getDeviceNo()) && StrUtil.equals(state.getCode(), "Normal")
&& deviceService.lambdaQuery()
.ne(GongfuDevice::getId, device.getId())
.eq(GongfuDevice::getDeviceNo, dto.getDeviceNo())
.eq(GongfuDevice::getDeviceState, state.getId())
.exists()
) {
sb.append("设备已存在;");
}
} }
} }
device.setCustomerId(0); device.setCustomerId(0);