设备修改bug修复

jinpengyong

2021-10-09 73f40e24c8900d8d7616b44515c965ce0ef20763

设备修改bug修复

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

 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" />