From 634a245b3d3ac6c1532df67259230c4c998a2382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 3 Feb 2026 10:41:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-1286=20=E8=AE=BE=E5=A4=87=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=85=AC=E5=8F=B8=E8=BD=AC=E7=A7=BB=20=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=92=8C=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BB=A3=E7=90=86=E5=95=86=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/DeviceController.java | 4 ---- .../mobilebroken/gongfu/controller/DeviceController.java | 9 --------- 2 files changed, 13 deletions(-) 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 cb3ba5f1..375aa177 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 8129b075..17952cb2 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);