From db405cb2857b53ca23aae200e24b11b495dc07c0 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Fri, 18 Oct 2024 13:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=A6=E9=98=B3=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/service/impl/SysIotModelServiceImpl.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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