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());