diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceFeignClient.java
index 14c3be2cc..7cf561e18 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceFeignClient.java
@@ -38,7 +38,7 @@ public interface DeviceFeignClient {
                                                  @RequestParam("nextTimeCheck") String nextTimeCheck);
 
     @PostMapping("/updateDevComFlag")
-    @ApiOperation("修改装置通讯状态")
+    @ApiOperation("修改装置通讯状态及时间")
     HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO);
 
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java
index 2a4ee0307..8557a8f15 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java
@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -180,10 +181,10 @@ public class DeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @PostMapping("/updateDevComFlag")
-    @ApiOperation("修改装置通讯状态")
+    @ApiOperation("修改装置通讯状态及时间")
     public HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO) {
         String methodDescribe = getMethodDescribe("updateDevComFlag");
-        boolean update = iDeviceService.lambdaUpdate().set(Device::getComFlag, devComFlagDTO.getStatus()).set(Device::getUpdateTime, devComFlagDTO.getDate()).eq(Device::getId, devComFlagDTO.getId()).update();
+        boolean update = iDeviceService.lambdaUpdate().set(Objects.nonNull(devComFlagDTO.getStatus()),Device::getComFlag,devComFlagDTO.getStatus() ).set(Device::getUpdateTime, devComFlagDTO.getDate()).eq(Device::getId, devComFlagDTO.getId()).update();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
     }
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index 3b88bb3ff..4b51d86b0 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -3695,13 +3695,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             List<String> updateDevIds = new ArrayList<>();
             List<String> lineIds = list.stream().filter(temp -> Objects.equals(temp.getTerminalType(), 6)).map(PqsTerminalLogs::getObjIndex).distinct().collect(Collectors.toList());
             List<String> devIds = list.stream().filter(temp -> Objects.equals(temp.getTerminalType(), 4)).map(PqsTerminalLogs::getObjIndex).distinct().collect(Collectors.toList());
+            if(!CollectionUtils.isEmpty(lineIds)){
+                //更新的终端
+                List<Line> lineById = this.getLineById(lineIds);
+                List<String> devIdList = lineById.stream().map(temp -> {
+                    return temp.getPids().split(",")[4];
+                }).distinct().collect(Collectors.toList());
+                updateDevIds.addAll(devIdList);
+            }
+
 
-            //更新的终端
-            List<Line> lineById = this.getLineById(lineIds);
-            List<String> devIdList = lineById.stream().map(temp -> {
-                return temp.getPids().split(",")[4];
-            }).distinct().collect(Collectors.toList());
-            updateDevIds.addAll(devIdList);
             updateDevIds.addAll(devIds);
             if(!CollectionUtils.isEmpty(delDevIds)){
                 updateDevIds.removeAll(delDevIds);