ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整二楼提出的意见

Browse Source
This commit is contained in:
hongawen
2025-06-20 14:21:41 +08:00
parent ed54f79983
commit a11189d85c
3 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -757,8 +757,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
queryWrapper
.eq("state", DataStateEnum.ENABLE.getCode())
.eq("Dev_Type", param.getDevType())
.and(q -> q.eq("name", param.getName()).or()
.eq("Create_Id", param.getCreateId())); //设备序列号重复
.and(q -> q.eq("Create_Id", param.getCreateId())); //设备序列号重复，不管设备类型，原设备类型条件删除
// .eq("pattern", param.getPattern())
// .eq("manufacturer", param.getManufacturer())
// .eq("Dev_Type", param.getDevType()).or()