From d4dba1617daf0a6d3c01ed8aab93ef2bd59d7fb4 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 15 Jan 2025 09:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E6=A3=80=E8=AE=BE=E5=A4=87-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E3=80=81=E8=AE=BE=E5=A4=87=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/device/service/impl/PqDevServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java index 43b84069..00d30faf 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java @@ -75,7 +75,7 @@ public class PqDevServiceImpl extends ServiceImpl implements @Override @Transactional(rollbackFor = {Exception.class}) public boolean addPqDev(PqDevParam pqDevParam) { -// this.checkRepeat(pqDevParam, false); + this.checkRepeat(pqDevParam, false); PqDev pqDev = new PqDev(); BeanUtil.copyProperties(pqDevParam, pqDev); @@ -109,7 +109,7 @@ public class PqDevServiceImpl extends ServiceImpl implements @Override @Transactional(rollbackFor = {Exception.class}) public boolean updatePqDev(PqDevParam.UpdateParam updateParam) { -// this.checkRepeat(updateParam, true); + this.checkRepeat(updateParam, true); PqDev pqDev = new PqDev(); BeanUtil.copyProperties(updateParam, pqDev); @@ -588,11 +588,11 @@ public class PqDevServiceImpl extends ServiceImpl implements QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper .eq("state", DataStateEnum.ENABLE.getCode()) - .and(q -> q.eq("name", param.getName()) - .eq("pattern", param.getPattern()) - .eq("manufacturer", param.getManufacturer()) - .eq("Dev_Type", param.getDevType()).or() + .and(q -> q.eq("name", param.getName()).or() .eq("Create_Id", param.getCreateId())); //设备序列号重复 +// .eq("pattern", param.getPattern()) +// .eq("manufacturer", param.getManufacturer()) +// .eq("Dev_Type", param.getDevType()).or() if (isExcludeSelf) { if (param instanceof PqDevParam.UpdateParam) { queryWrapper.ne("id", ((PqDevParam.UpdateParam) param).getId());