协会创建文化活动后活动管理界面出现四条活动记录,已修复
This commit is contained in:
+11
-1
@@ -79,10 +79,21 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
|
|||||||
update(tissue);
|
update(tissue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按当前用户的数据权限分页返回文化活动及其流程任务信息。
|
||||||
|
*
|
||||||
|
* @param page 分页及排序参数,包含页码、每页条数和排序字段、方向
|
||||||
|
* @param year 申请年份,如 2026;为空时不限定年份
|
||||||
|
* @param name 活动名称关键字;为空时不限定名称
|
||||||
|
* @param unionId 所属工会 ID;为空时不限定工会
|
||||||
|
* @param activity_type 活动类型:40001 校工会、40002 分工会、40003 协会
|
||||||
|
* @return Pagination 分页对象,list 包含活动、流程实例和任务字段,totalCount 为查询总条数
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Object pageData(PageForm page, String year, String name, String unionId, Integer activity_type) {
|
public Object pageData(PageForm page, String year, String name, String unionId, Integer activity_type) {
|
||||||
Cnd cnd = Cnd.NEW();
|
Cnd cnd = Cnd.NEW();
|
||||||
|
|
||||||
|
// 列表不使用任务参与人字段,不关联参与人表,避免同一任务因多名审批人重复显示。
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
tissue.*,
|
tissue.*,
|
||||||
@@ -112,7 +123,6 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
|
|||||||
LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode
|
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_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 t ON t.processInstanceId = ins.id AND t.taskState = 10
|
||||||
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
|
|
||||||
$condition
|
$condition
|
||||||
""");
|
""");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user