diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index b3289887..ce713f01 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -613,10 +613,6 @@ public class DeviceController extends ControllerBase { sb.append("设备状态无效;"); } else { 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); diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java index ff49822e..187bfe42 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java @@ -631,15 +631,6 @@ public class DeviceController extends ControllerBase { sb.append("设备状态无效;"); } else { 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);