From 07b38a2251b9a28358f961e414be40d3517f1e08 Mon Sep 17 00:00:00 2001
From: hongqiwei <1143662660@qq.com>
Date: Mon, 14 Sep 2026 10:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E5=88=9B=E5=BB=BA=E6=96=87?=
 =?UTF-8?q?=E5=8C=96=E6=B4=BB=E5=8A=A8=E5=90=8E=E6=B4=BB=E5=8A=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E5=87=BA=E7=8E=B0=E5=9B=9B=E6=9D=A1?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B7=B2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActivityCultureServiceImpl.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java
index 10cfae0..c56742b 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java
@@ -79,10 +79,21 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
         update(tissue);
     }
 
+    /**
+     * 按当前用户的数据权限分页返回文化活动及其流程任务信息。
+     *
+     * @param page 分页及排序参数，包含页码、每页条数和排序字段、方向
+     * @param year 申请年份，如 2026；为空时不限定年份
+     * @param name 活动名称关键字；为空时不限定名称
+     * @param unionId 所属工会 ID；为空时不限定工会
+     * @param activity_type 活动类型：40001 校工会、40002 分工会、40003 协会
+     * @return Pagination 分页对象，list 包含活动、流程实例和任务字段，totalCount 为查询总条数
+     */
     @Override
     public Object pageData(PageForm page, String year, String name, String unionId, Integer activity_type) {
         Cnd cnd = Cnd.NEW();
 
+        // 列表不使用任务参与人字段，不关联参与人表，避免同一任务因多名审批人重复显示。
         Sql sql = Sqls.create("""
                 SELECT
                 	tissue.*,
@@ -112,7 +123,6 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
                 	LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode
                 	LEFT JOIN `wf_process_instance` ins ON ins.businessNo = tissue.id
                     LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
-                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
                 	$condition
                 """);