parent
1d72e4bcc0
commit
634a245b3d
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue