From 33523867aae5d3a1ce385ab1590378730553ed27 Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Wed, 10 Sep 2025 10:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=87=AA=E5=8A=A8=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E6=B2=A1=E6=9C=89=E7=A7=9F=E6=88=B7id=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sis/service/impl/SisAlarmEventsServiceImpl.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
index 732e4acf..be817438 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
@@ -256,11 +256,11 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean taskAssignment(AlarmAssignmentBo bo) {
         // 验证工单状态
-        SisAlarmEventsVo sisAlarmEventsVo = this.baseMapper.selectVoById(bo.getAlarmId());
-        if (sisAlarmEventsVo == null) {
+        SisAlarmEvents sisAlarmEvents = this.baseMapper.selectById(bo.getAlarmId());
+        if (sisAlarmEvents == null) {
             throw new RuntimeException("工单信息不存在!");
         }
-        if (!sisAlarmEventsVo.getState().equals(AlarmStatus.REPORTED.getCode())) {
+        if (!sisAlarmEvents.getState().equals(AlarmStatus.REPORTED.getCode())) {
             throw new RuntimeException("当前工单已指派，请刷新后重新指派!");
         }
 
@@ -282,7 +282,7 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
         }
 
         SisAlarmEvents events = new SisAlarmEvents();
-        events.setId(sisAlarmEventsVo.getId());
+        events.setId(sisAlarmEvents.getId());
         events.setSolveId(bo.getSolveId());
         events.setSolveName(bo.getSolveName());
         events.setSolvePhone(bo.getSolvePhone());
@@ -294,13 +294,14 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
         log.info("修改事件表完成，result={}", i > 0);
         // 写入处理流程
         SisAlarmEventProcess process = new SisAlarmEventProcess();
-        process.setAlarmId(sisAlarmEventsVo.getId());
+        process.setAlarmId(sisAlarmEvents.getId());
         process.setSolveId(attendInfo.getEmployeeId());
         process.setSolveName(attendInfo.getEmployeeName());
         process.setWorkReply(bo.getRemark());
         process.setState(events.getState());
         process.setWorkReplyTime(now);
         process.setReceiveTaskTag(0L);
+        process.setTenantId(sisAlarmEvents.getTenantId());
         Boolean insert = alarmEventProcessService.insert(process);
         log.info("事件处理信息写入完成,result= {}", insert);
         //TODO 推送到执行客户端