From 93ed334c0ef60d22e2f1bd746f81843972488360 Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Mon, 29 Dec 2025 18:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EPCS=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmsDeviceSettingServiceImpl.java     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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