commit

src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionChairmanHandler.java

@@ -0,0 +1,50 @@
+package com.budwk.app.flow.handler;
+
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.flow.engine.AssignmentHandler;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.flow.engine.model.TaskModel;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+
+import java.util.List;
+
+/**
+ * @author hqw
+ * @date 2026/1/12 17:33
+ * @description 校工会主席
+ */
+public class FlowSchoolUnionChairmanHandler implements AssignmentHandler {
+
+    @Override
+    public List<String> assign(TaskModel model, Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        Sql sql = Sqls.create("""
+                SELECT
+                    userRole.userId
+                FROM
+                    `sys_user_role` userRole
+                    LEFT JOIN sys_role role ON role.id = userRole.roleId
+                WHERE
+                    role.`code` = @roleCode
+                GROUP BY
+                    userRole.userId
+                """).setParam("roleCode", RoleConstant.SCHOOL_UNION_CHAIRMAN.name());
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        return sql.getList(String.class);
+    }
+
+
+    @Override
+    public String getMessage() {
+        return "获取校工会主席";
+    }
+
+    @Override
+    public int getOrder() {
+        return AssignmentHandler.super.getOrder();
+    }
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java

@@ -117,7 +117,7 @@ public class CondolenceSchoolUnionApprovalController {
 		} else {
 			cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
 		}
-		cnd.groupBy("t.id");
+		cnd.groupBy("info.id");
 		sql.setCondition(cnd);
 		Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pageVO);