From 2a2a285793d1b0ceda2b631f6114531f00e47abe Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Mon, 15 Dec 2025 09:45:21 +0800
Subject: [PATCH] commit

---
 ...acherCongressDelegateManageController.java |  2 ++
 ...TeacherCongressDelegatePushController.java | 34 +++++--------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java
index 9d80636..9a51ce0 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java
@@ -496,6 +496,8 @@ public class TeacherCongressDelegateManageController {
                 dao.update(delegate);
                 Sys_user_role userRole = new Sys_user_role();
                 userRole.setTcDelegationId(delegation_unit.getDelegationId());
+                userRole.setUserId(delegate.getUserId());
+                userRole.setTcSessionId(delegate.getSessionId());
                 Sys_role sys_role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()));
 
                 if (sys_role.getId().equals(delegate.getRoleId())) {
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
index 0f3404c..fd3deba 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
@@ -600,45 +600,29 @@ public class TeacherCongressDelegatePushController {
                   t.finishTime,
                   t.taskParentId,
                   t.variable taskVariable,
-                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
-                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                  IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
+                  (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
                 FROM
-                  wf_process_task t
-                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
-                  LEFT JOIN teacher_congress_delegate_push info ON info.id = ins.businessNo
+                  teacher_congress_delegate_push info
+                  LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.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
-                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
-                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.and("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801");
-//        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.andEX("info.pushUnionId", "=", unionId);
+
         if (!"全部".equals(isFormalOrAttendance)) {
             cnd.and("info.representativeType", "=", isFormalOrAttendance);
         }
-        cnd.andEX("info.sessionId", "=", sessionId);
-        cnd.andEX("info.unionId", "=", unionId);
-        cnd.and("ins.state", "=", 20);
-//        if (approval) {
-//            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
-//        } else {
-//            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
-//        }
-
         if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
             SqlExpressionGroup group = new SqlExpressionGroup();
             group.orLike("info.userName", pageForm.getSearchKeyword());
             group.orLike("info.loginName", pageForm.getSearchKeyword());
             cnd.and(group);
         }
-
-        cnd.groupBy("t.id");
-        if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
-            cnd.desc("t.createdAt");
-        } else {
-            cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
-        }
+        cnd.desc("info.createdAt");
         sql.setCondition(cnd);
         return sql;
     }