diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
index a9d4153..e28a1fe 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
@@ -86,7 +86,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
         DevicesSettingVo devicesSettingVo = new DevicesSettingVo();
         BeanUtils.copyProperties(emsDevicesSetting, devicesSettingVo);
         EmsPcsSetting pcsSetting = emsPcsSettingMapper.selectEmsPcsSettingByDeviceId(id);
-        devicesSettingVo.setPcsSetting(pcsSetting);
+        if (pcsSetting != null) {
+            devicesSettingVo.setPcsSetting(pcsSetting);
+        }
         return devicesSettingVo;
     }
 
@@ -102,11 +104,13 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
             return -1;
         }
         devicesSetting.setCreateTime(DateUtils.getNowDate());
-        int id = emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
+        int result = emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
         EmsPcsSetting pcsSetting = devicesSetting.getPcsSetting();
-        pcsSetting.setDeviceSettingId(devicesSetting.getId());
-        emsPcsSettingMapper.insertEmsPcsSetting(pcsSetting);
-        return id;
+        if (pcsSetting != null) {
+            pcsSetting.setDeviceSettingId(devicesSetting.getId());
+            emsPcsSettingMapper.insertEmsPcsSetting(pcsSetting);
+        }
+        return result;
     }
 
     /**
@@ -136,7 +140,11 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
             return -2;
         }
         devicesSetting.setUpdateTime(DateUtils.getNowDate());
-        emsPcsSettingMapper.updateEmsPcsSetting(devicesSetting.getPcsSetting());
+        EmsPcsSetting pcsSetting = devicesSetting.getPcsSetting();
+        if (pcsSetting != null) {
+            pcsSetting.setUpdateTime(DateUtils.getNowDate());
+            emsPcsSettingMapper.updateEmsPcsSetting(pcsSetting);
+        }
         return emsDevicesMapper.updateEmsDevicesSetting(devicesSetting);
     }