From a871c37643bd0cd911cba6bde7d2f35582a3064c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 04 Aug 2026 08:08:34 +0800
Subject: [PATCH] fix(workorder): 修复管理员查询线索事件时的用户ID获取问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
index 45e6893..049a4fb 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
@@ -137,6 +137,10 @@
// 非管理员：排除已退回状态（状态2）
statusList = java.util.Arrays.asList(0, 1, 3, 4);
} else {
+ if (onlyMine != null && onlyMine == 1) {
+ // 管理员：仅查询当前用户数据
+ userId = AuthUtil.getUserId();
+ }
// 管理员：可以查询所有状态
statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
}
@@ -185,6 +189,7 @@
if (isAdmin) {
// 管理员：可以查询所有状态
+ userId = AuthUtil.getUserId();
statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
} else {
deptId = Long.valueOf(AuthUtil.getDeptId());
@@ -233,7 +238,7 @@
clueEvent = new GdClueEventEntity();
}
clueEvent.setResultId(distributeParam.getResultId());
- clueEvent.setWorkOrderId(distributeParam.getWorkOrderId());
+ clueEvent.setWorkOrderId(taskResult.getPatrolTaskId());
clueEvent.setDisposeUser(distributeParam.getDisposeUser());
clueEvent.setDisposeDept(distributeParam.getDisposeDept());
clueEvent.setLongitude(distributeParam.getLongitude());
--
Gitblit v1.9.3