Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java

@@ -101,7 +101,8 @@ public class ProposalExpeditingController {
                 $condition
                 """);
 		Cnd cnd = Cnd.NEW();
-		cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply"));
+		// 催办列表只展示现行 WF 承办答复环节中尚未完成的主办、二次答复及意见答复任务。
+		cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply"));
 
 		if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
 			cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalControlController.java

@@ -47,6 +47,7 @@ public class ProposalControlController {
     @SaCheckPermission("proposal.control")
     @ApiOperation("分页列表")
     public Result pageData(@Valid ProposalSearchParam pageForm) {
+        // 状态调整属于提案业务，只保留能够关联到 proposal_info 的 WF 任务，排除其他业务流程产生的空白行。
         Sql sql = Sqls.create("""
                 SELECT
                     info.*,
@@ -72,7 +73,7 @@ public class ProposalControlController {
                     LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
                     LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
                     LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
-                    LEFT JOIN proposal_info info ON info.id = ins.businessNo
+                    INNER JOIN proposal_info info ON info.id = ins.businessNo
                     LEFT JOIN proposal_type type ON type.id = info.typeId
                     LEFT JOIN teacher_congress_session tcs ON tcs.id = info.sessionId
                     LEFT JOIN teacher_congress_delegation tcd ON tcd.id = info.delegationId