diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
index 8cd92d7..9a04941 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.constant.IotConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.AsUser;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.onenet.*;
 import com.ruoyi.common.exception.ServiceException;
@@ -25,7 +26,6 @@ import com.ruoyi.device.service.IAsUserService;
 import com.ruoyi.device.service.IAsWateringRecordService;
 import com.ruoyi.system.mapper.SysUserMapper;
 import lombok.SneakyThrows;
-import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -243,9 +243,11 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         asDevice.setCreateTime(DateUtils.getNowDate());
         AsDeviceClassify deviceClassify = classifyMapper.selectAsDeviceClassifyByClassifyId(asDevice.getClassifyId());
         asDevice.setClassifyName(deviceClassify.getClassifyName());
-        SysUser sysUser = userMapper.selectUserById(asDevice.getUserId());
-        asDevice.setUserName(sysUser.getUserName());
-        asDevice.setNickName(sysUser.getNickName());
+        if(ObjectUtils.isNotEmpty(asDevice.getUserId())){
+            AsUser user = asUserService.selectUserById(asDevice.getUserId());
+            asDevice.setUserName(user.getUserName());
+            asDevice.setNickName(user.getNickName());
+        }
         AsModel model = modelMapper.selectAsModelByModelId(asDevice.getModelId());
         asDevice.setModel(model.getModel());
         AsDeviceVersion asDeviceVersion = versionMapper.selectAsDeviceVersionByVersionId(asDevice.getVersionId());