From ecc2b30eb496d919db6bb39c6adea267482c422c Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 19 Sep 2024 15:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/service/impl/TbBdRecordServiceImpl.java | 3 +++ .../java/com/bonus/base/service/impl/TbDeviceServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java index 77eeb26..1360987 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java @@ -141,6 +141,9 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{ if (tbBdDeviceRecord.size() > 1) { return AjaxResult.error("设备名称或编码与库中重复，请勿重复添加"); } + if (tbBdDeviceRecord.size() == 1 && !deviceRecord.getId().equals(tbBdDeviceRecord.get(0).getId())) { + return AjaxResult.error("提交的数据中设备名称或编码与库中重复，请勿重复添加"); + } } } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java index 8ea8032..0ad954c 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDeviceServiceImpl.java @@ -79,6 +79,9 @@ public class TbDeviceServiceImpl implements TbDeviceService{ if (tbDevice.size() > 1) { return AjaxResult.error(ExceptionEnum.NAME_DUPLICATE.getCode(), "设备名称或编码与库中重复"); } + if (tbDevice.size() == 1 && !tbDevice.get(0).getId().equals(record.getId())) { + return AjaxResult.error(ExceptionEnum.NAME_DUPLICATE.getCode(), "设备名称或编码与库中重复"); + } } int result = tbDeviceMapper.updateByPrimaryKeySelective(record); if (result > 0) {