diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index 7d9bb92d..e960216d 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -98,7 +98,7 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); SysEquipmentVo oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode()); // 判断设备编码是否存在 - if (sysEquipmentMapper.queryEquipmentByCode(sysEquipment.getCode()) > 0) { + if (oldSysEquipment != null && sysEquipmentMapper.queryEquipmentByCode(sysEquipment.getCode()) > 0) { if (!oldSysEquipment.getId().equals(sysEquipmentDto.getId())) { throw new RuntimeException("设备编码已存在"); }