From ec860211e41595a74ced0b5242ddf835ccf0983d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 29 Jul 2026 18:27:02 +0800
Subject: [PATCH] fix(workorder): 修复线索事件统计中的权限控制逻辑
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index fed63e2..06252aa 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -73,11 +73,6 @@
<result column="completed_count" property="completedCount"/>
</resultMap>
- <sql id="gdClueEventDeptWhere">
- where ce.is_deleted = 0
- and ce.dispose_dept = #{deptId}
- </sql>
-
<resultMap id="gdClueEventExcelResultMap" type="org.sxkj.gd.workorder.excel.GdClueEventExcel">
<result column="result_id" property="resultId"/>
<result column="work_order_id" property="workOrderId"/>
@@ -119,7 +114,10 @@
left join ja_gd_task_result tr on tr.id::VARCHAR = ce.result_id::VARCHAR and tr.is_deleted = 0
left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
- <include refid="gdClueEventDeptWhere"/>
+ where ce.is_deleted = 0
+ <if test="deptId != null">
+ and ce.dispose_dept = #{deptId}
+ </if>
<if test="statusList != null and statusList.size() > 0">
and ce.event_status in
<foreach collection="statusList" item="status" open="(" separator="," close=")">
@@ -180,7 +178,10 @@
left join blade_user cu on cu.id::VARCHAR = ce.create_user::VARCHAR and cu.is_deleted = 0
left join blade_dept cd on cd.id::VARCHAR = ce.create_dept::VARCHAR and cd.is_deleted = 0
left join ja_gd_task_result tr on tr.id::VARCHAR = ce.result_id::VARCHAR and tr.is_deleted = 0
- <include refid="gdClueEventDeptWhere"/>
+ where ce.is_deleted = 0
+ <if test="deptId != null">
+ and ce.dispose_dept = #{deptId}
+ </if>
and ce.id = #{id}
</select>
@@ -191,7 +192,10 @@
COALESCE(sum(case when ce.event_status = 3 then 1 else 0 end), 0) as disposed_count,
COALESCE(sum(case when ce.event_status = 4 then 1 else 0 end), 0) as completed_count
from ja_gd_clue_event ce
- <include refid="gdClueEventDeptWhere"/>
+ where ce.is_deleted = 0
+ <if test="deptId != null">
+ and ce.dispose_dept = #{deptId}
+ </if>
<if test="statusList != null and statusList.size() > 0">
and ce.event_status in
<foreach collection="statusList" item="status" open="(" separator="," close=")">
--
Gitblit v1.9.3