diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java index f41f2eff..2924f6e2 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java @@ -83,8 +83,11 @@ public class SysIotModelServiceImpl implements SysIotModelService { SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); SysIotModelVo sysIotModelQuery = sysIotModelMapper.selectIotModelByCode(sysIotModelDto.getIotModelCode()); - if (!(Long.valueOf(sysIotModelQuery.getId()) == Long.valueOf(sysIotModelDto.getId())) && !(sysIotModelQuery == null)) { - throw new ServiceException("物模型code已经存在"); + if (!(sysIotModelQuery == null)){ + if(!(sysIotModelQuery.getId().equals(sysIotModelDto.getId()))){ + throw new ServiceException("物模型code已经存在"); + } + } sysIotModel.setUpdatedTime(new Date()); sysIotModel.setUpdatedBy(sysUserVo.getAccount());