From 0a79e4295745bc59c0f8b8624218df7a226d14b9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 26 Feb 2026 18:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java
index 95b874f..ad3d739 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java
@@ -73,7 +73,9 @@
 		callEntity.setId(patrolTask.getId());
 		callEntity.setPatrolTaskName(patrolTask.getPatrolTaskName());
 		callEntity.setTaskDepartment(SysCache.getDeptName(patrolTask.getCreateDept()));
+		callEntity.setTaskDepartmentId(patrolTask.getCreateDept());
 		callEntity.setTaskInitiator(UserCache.getUser(patrolTask.getCreateUser()).getName());
+		callEntity.setTaskInitiatorId(patrolTask.getCreateUser());
 		callEntity.setPlanExecuteTime(patrolTask.getExecuteTime());
 		callEntity.setActualExecuteTime(dtos.get(0).getOccurTime());// 第一条数据的发生时间
 

--
Gitblit v1.9.3