From a95cd49179d6e27c95f6016f5e31f1c91e92dfb2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:45:34 +0800
Subject: [PATCH] fix(workorder): 修复线索事件查询中的用户部门关联条件
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 02b4429..30fbe2e 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
@@ -128,19 +128,17 @@
// 2. 判断是否为管理员
boolean isAdmin = AuthUtil.isAdministrator() || AuthUtil.isAdmin();
-
+ mine = onlyMine == null ? 0 : onlyMine;
+ if (mine == 1) {
+ // 管理员：仅查询当前用户数据
+ userId = AuthUtil.getUserId();
+ }
if (!isAdmin) {
// 非管理员：获取部门ID和用户ID
deptId = Long.valueOf(AuthUtil.getDeptId());
- userId = AuthUtil.getUserId();
- mine = onlyMine == null ? 0 : onlyMine;
// 非管理员：排除已退回状态（状态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);
}
@@ -189,6 +187,7 @@
if (isAdmin) {
// 管理员：可以查询所有状态
+ userId = AuthUtil.getUserId();
statusList = java.util.Arrays.asList(0, 1, 2, 3, 4);
} else {
deptId = Long.valueOf(AuthUtil.getDeptId());
--
Gitblit v1.9.3