From 73f40e24c8900d8d7616b44515c965ce0ef20763 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Sat, 09 Oct 2021 16:01:26 +0800
Subject: [PATCH] 设备修改bug修复
---
screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml | 1 +
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index fdfdb9d..02d8393 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -103,8 +103,7 @@
queryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
QueryWrapper<SpecialDevice> specialDeviceQueryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
-
+ specialDeviceQueryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
if (deviceService.getOne(queryWrapper) != null || specialDeviceService.getOne(specialDeviceQueryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
diff --git a/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml b/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml
index a422955..f4d754f 100644
--- a/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SpecialDeviceMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="name" property="name" />
<result column="mac" property="mac" />
+ <result column="guid" property="guid" />
<result column="operate_ids" property="operateIds" />
<result column="organization_id" property="organizationId" />
<result column="device_version_id" property="deviceVersionId" />
--
Gitblit v1.8.0