commit

2025-09-30 13:56:43 +08:00
parent aa516ab4e7
commit 88487a76fa
52 changed files with 1433 additions and 314 deletions
@@ -146,17 +146,6 @@ public class MemberApplyBranchUnionApprovalController {
        Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
        return Result.success(pagination);
    }
-
-
-    @At
-    @ApiOperation("分工会审核撤回")
-    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("member.apply.branchUnionApproval")
-    @SLog(tag = "会员管理-入会申请-分工会撤回", msg = "分工会入会审核撤回")
-    public Result revoke(@Valid String taskId) {
-        bpmService.revokeTask(taskId);
-        return Result.success();
-    }
 }


@@ -39,15 +39,17 @@ public class MemberApplyCommonController {
            return Result.success(user);
        }

-        // 分会主席只能查看本分会用户或未分配分会的用户
-        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) && (user.getUnionId().equals(SecurityUtil.getUnionId()) || StrUtil.isBlank(user.getUnionId()))) {
+        // 分会主席只能查看本分会用户或未分配分会的用户       分工会操作员同主席权限一致
+        if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name()) && (user.getUnionId().equals(SecurityUtil.getUnionId()) || StrUtil.isBlank(user.getUnionId()))) {
            user.setIdCard(DesensitizedUtil.idCardNum(user.getIdCard(), 3, 4));
            user.setMobile(DesensitizedUtil.mobilePhone(user.getMobile()));
            return Result.success(user);
        }

-        // 分工会操作员同主席权限一致
-        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_OPERATOR.name()) && (user.getUnionId().equals(SecurityUtil.getUnionId()) || StrUtil.isBlank(user.getUnionId()))) {
+        // 工会小组组长可以看小组里面的用户
+        if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_GROUP_LEADER.name())
+                && StrUtil.isAllNotBlank(user.getUnionGroupId(), SecurityUtil.getUnionGroupId())
+                && user.getUnionGroupId().equals(SecurityUtil.getUnionGroupId())) {
            user.setIdCard(DesensitizedUtil.idCardNum(user.getIdCard(), 3, 4));
            user.setMobile(DesensitizedUtil.mobilePhone(user.getMobile()));
            return Result.success(user);
@@ -12,6 +12,7 @@ import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.models.Sys_union_group;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -28,6 +29,7 @@ import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
@@ -91,6 +93,11 @@ public class MemberApplyController {
            args.set("origin", "OTHER");
            memberApplyRecord.setOrigin("OTHER");
        }
+        // 再去判断有没有工会小组
+        Sys_union_group group = dao.fetch(Sys_union_group.class, Cnd.where(Sys_union_group::getUnionId, "=", SecurityUtil.getUnionId())
+                .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId()))));
+        args.set("type", Lang.isEmpty(group) ? "branch" : "group");
+
        dao.insertOrUpdate(memberApplyRecord);

        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
@@ -121,6 +128,10 @@ public class MemberApplyController {
            dict.set("origin", "OTHER");
            memberApplyRecord.setOrigin("OTHER");
        }
+        // 再去判断有没有工会小组
+        Sys_union_group group = dao.fetch(Sys_union_group.class, Cnd.where(Sys_union_group::getUnionId, "=", SecurityUtil.getUnionId())
+                .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId()))));
+        dict.set("type", Lang.isEmpty(group) ? "branch" : "group");

        dao.insertOrUpdate(memberApplyRecord);

@@ -144,37 +144,6 @@ public class MemberApplySchoolUnionApprovalController {
        return Result.success(pagination);
    }

-
-    @At
-    @Aop(TransAop.READ_COMMITTED)
-    @ApiOperation("会员入会校工会审核")
-    @SaCheckPermission("member.apply.schoolUnionApproval")
-    @SLog(tag = "会员管理-会员入会申请-校工会审核", msg = "会员入会审核（校工会）")
-    public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) {
-        Map<String, Object> variables = BeanUtil.beanToMap(approvalParam);
-
-        if (approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)) {
-            // 审核通过了，要去改基础数据
-            MemberApplyRecord record = memberCommonService.dao().fetch(MemberApplyRecord.class, Cnd.where("id", "=", approvalParam.getProcessInstanceBusinessId()));
-            Sys_user sysUser = new Sys_user();
-            BeanUtil.copyProperties(record, sysUser);
-            sysUser.setId(record.getUserId());
-            dao.updateIgnoreNull(sysUser);
-        }
-        bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, null);
-        return Result.success();
-    }
-
-
-    @At
-    @ApiOperation("校工会审核撤回")
-    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("member.apply.schoolUnionApproval")
-    @SLog(tag = "会员管理-入会申请-校工会撤回", msg = "校工会入会审核撤回")
-    public Result revoke(@Valid String taskId) {
-        bpmService.revokeTask(taskId);
-        return Result.success();
-    }
 }


@@ -0,0 +1,114 @@
+package com.budwk.app.zhgh.staffmanage.member.controller.apply;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.bpm.service.BpmService;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.web.controllers.open.commons.service.CommonService;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm;
+import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+/**
+ * 会员入会申请分工会审核
+ * @author fky
+ */
+@IocBean
+@Ok("json:full")
+@ApiOperation("会员入会申请工会小组审核")
+@At("/platform/member/apply/unionGroupApproval")
+public class MemberApplyUnionGroupApprovalController {
+
+    @Inject
+    private BpmService bpmService;
+    @Inject
+    private CommonService commonService;
+    @Inject
+    private MemberCommonService memberCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html")
+    @SaCheckPermission("member.apply.unionGroupApproval")
+    public void index() {}
+
+
+    @At
+    @ApiOperation("会员入会申请工会小组审核列表")
+    @SaCheckPermission("member.apply.unionGroupApproval")
+    public Result pageData(MemberApplyPageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.id,
+                    info.userName,
+                    info.loginName,
+                    info.unitName,
+                    info.unionName,
+                    info.userState,
+                    info.preparedBy,
+                    info.personType,
+                    info.applyDateTime,
+                    info.sign,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    t.variable taskVariable,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                    IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                    wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN member_apply_record info ON info.id = ins.businessNo
+                    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();
+        MemberApplyPageForm.buildSearch(cnd, pageForm);
+
+        cnd.and("t.taskName", "=", "95688013-9dcb-43f1-ae54-c83ea2d2ddb1");
+
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (pageForm.getAudit()) {
+            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.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("t.createdAt");
+            cnd.desc("info.applyDateTime");
+        } else {
+            cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success(pagination);
+    }
+
+}
@@ -1,52 +1,27 @@
 package com.budwk.app.zhgh.staffmanage.member.controller.change;

 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaMode;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.budwk.app.base.annotation.SLog;
-import com.budwk.app.base.constant.BpmProcessConstant;
-import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.PageUtil;
-import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum;
-import com.budwk.app.bpm.models.BpmProcessInstance;
-import com.budwk.app.bpm.models.BpmProcessTask;
-import com.budwk.app.bpm.param.BpmTaskApprovalParam;
-import com.budwk.app.bpm.service.BpmService;
-import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
-import com.budwk.app.sys.models.Sys_user_history;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
-import com.budwk.app.web.controllers.open.commons.service.CommonService;
-import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord;
 import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberChangePageForm;
-import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm;
-import com.budwk.app.zhgh.staffmanage.member.service.MemberBranchUnionManageService;
 import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
-import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.Param;

-import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;

 /**
 * @version 1.0
@@ -64,21 +39,16 @@ public class MemberBranchUnionAuditController {
    @Inject
    private Dao dao;
    @Inject
-    private CommonService commonService;
-    @Inject
    private MemberCommonService memberCommonService;
-    @Inject
-    private MemberBranchUnionManageService memberBranchUnionManageService;
-

    @At("")
-    @Ok("beetl:/platform/zhgh/staffmanage/member/change/branchUnionAudit/index.html")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html")
    @SaCheckPermission("member.change.branchUnion.audit")
    public void index() {
    }

    @At
-    @Ok("beetl:/platform/zhgh/staffmanage/member/change/branchUnionAudit/form.html")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/change/branchunionaudit/form.html")
    @SaCheckPermission("member.change.branchUnion.audit")
    public void form() {
    }
@@ -129,7 +99,7 @@ public class MemberBranchUnionAuditController {
        Cnd cnd = Cnd.NEW();
        pageForm.buildSearch(cnd, "info.");

-        cnd.and("t.taskName", "=", "8ca3bcf0-7b86-4ef2-b19f-b76a1707e2da");
+        cnd.and("t.taskName", "=", "64805be3-b325-4c25-a516-d0c4e4a87509");
        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));

        if (pageForm.getAudit()) {
@@ -13,6 +13,7 @@ import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.sys.models.Sys_union;
+import com.budwk.app.sys.models.Sys_union_group;
 import com.budwk.app.sys.models.Sys_unit;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -26,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -92,7 +94,11 @@ public class MemberChangeApplyController {

        // 开启流程实例
        Dict args = Dict.create();
-        args.set("origin", "person");
+        // 判断有没有工会小组
+        Sys_union_group group = dao.fetch(Sys_union_group.class, Cnd.where(Sys_union_group::getUnionId, "=", SecurityUtil.getUnionId())
+                .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId()))));
+        args.set("submit", Lang.isEmpty(group) ? "singleBranch" : "singleHaveGroup");
+
        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
        args.set(FlowConst.FORM_DATA, memberChangeRecord);
        ProcessInstance instance = flowEngine.startProcessInstanceByKey("HYBG", memberChangeRecord.getId(), SecurityUtil.getUserId(), args);
@@ -117,7 +123,10 @@ public class MemberChangeApplyController {
        dao.insertOrUpdate(memberChangeRecord);

        Dict dict = Dict.create();
-        dict.set("origin", "personType");
+        // 判断有没有工会小组
+        Sys_union_group group = dao.fetch(Sys_union_group.class, Cnd.where(Sys_union_group::getUnionId, "=", SecurityUtil.getUnionId())
+                .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId()))));
+        dict.set("submit", Lang.isEmpty(group) ? "singleBranch" : "singleHaveGroup");
        dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
        dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
        flowCommonService.executeTask(dict);
@@ -125,7 +134,6 @@ public class MemberChangeApplyController {
    }


-
    @At
    @ApiModelProperty("根据id查询变更记录")
    @SaCheckPermission("member.change.apply")
@@ -139,7 +147,7 @@ public class MemberChangeApplyController {
     * @return
     */
    @At
-    @SaCheckPermission(value = {"member.change.branchUnion.audit","member.change.schoolUnion.audit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"member.change.branchUnion.audit","member.change.schoolUnion.audit", "member.change.unionGroup.audit"}, mode = SaMode.OR)
    public Result getUserByIdForMemberChange(String userId){
        View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", userId));
        NutMap nutMap = Lang.obj2nutmap(user);
@@ -22,6 +22,7 @@ import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.sys.models.Sys_config;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -101,9 +102,12 @@ public class MemberChangeManageController {
        }
        boolean schoolRoleBool = AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name(), RoleConstant.SYSADMIN.name());
        boolean branchRoleBool = AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name());
+        boolean groupRoleBool = AuthUtil.hasRole(RoleConstant.BRANCH_UNION_GROUP_LEADER.name());

        // 变更类型
-        MemberChangeOrigin changeOrigin = schoolRoleBool ? MemberChangeOrigin.SCHOOL_UNION : branchRoleBool ? MemberChangeOrigin.BRANCH_UNION : null;
+        MemberChangeOrigin changeOrigin = schoolRoleBool ? MemberChangeOrigin.SCHOOL_UNION :
+                branchRoleBool ? MemberChangeOrigin.BRANCH_UNION :
+                        groupRoleBool ? MemberChangeOrigin.UNION_GROUP : null;

        if (changeOrigin == null) {
            throw new BaseException("没有权限，或未设置工会小组");
@@ -114,10 +118,23 @@ public class MemberChangeManageController {

        // 开启流程实例
        Dict args = Dict.create();
+        args.set("submit", "admin");
+
        if (schoolRoleBool) {
-            args.set("origin", "schoolUnion");
+            args.set("adminSubmit", "schoolUnion");
+        } else if (branchRoleBool) {
+            args.set("adminSubmit", "branchUnion");
        } else {
-            args.set("origin", "branchUnion");
+            args.set("adminSubmit", "unionGroup");
+            // 还要设置工会小组是否需要审核的参数
+            Sys_config config = dao.fetch(Sys_config.class, Cnd.where(Sys_config::getConfigKey, "=", "UnionGroupIsNeedBranchAudit"));
+            if ("true".equals(config.getConfigValue())) {
+                // 需要，流转到分工会审核
+                args.set("groupAuditNext", "branchAudit");
+            } else {
+                // 不需要，流转到校工会审核
+                args.set("groupAuditNext", "schoolAudit");
+            }
        }
        args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
        args.set(FlowConst.FORM_DATA, record);
@@ -71,13 +71,13 @@ public class MemberSchoolUnionAuditController {
    private MemberSchoolUnionManageService memberSchoolUnionManageService;

    @At("")
-    @Ok("beetl:/platform/zhgh/staffmanage/member/change/schoolUnionAudit/index.html")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/change/schoolunionaudit/index.html")
    @SaCheckPermission("member.change.schoolUnion.audit")
    public void index() {
    }

    @At
-    @Ok("beetl:/platform/zhgh/staffmanage/member/change/schoolUnionAudit/form.html")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/change/schoolunionaudit/form.html")
    @SaCheckPermission("member.change.schoolUnion.audit")
    public void form() {
    }
@@ -127,7 +127,7 @@ public class MemberSchoolUnionAuditController {
        Cnd cnd = Cnd.NEW();
        pageForm.buildSearch(cnd, "info.");

-        cnd.and("t.taskName", "=", "f18d8726-75bc-43a9-87a8-2dd73341bdce");
+        cnd.and("t.taskName", "=", "55f85ecd-7aab-4ba9-a8ec-f256839947f0");
        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));

        if (pageForm.getAudit()) {
@@ -147,82 +147,4 @@ public class MemberSchoolUnionAuditController {
        return Result.success().addData(pagination);
    }

-
-    @At
-    @RepeatSubmit
-    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("member.change.schoolUnion.audit")
-    @SLog(tag = "会员管理-校工会管理", type = "memberSchoolUnionAudit", msg = "校工会会员审核")
-    public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) {
-        Map<String, Object> variables = BeanUtil.beanToMap(approvalParam);
-        if (approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)) {
-            MemberChangeRecord record = memberCommonService.dao().fetch(MemberChangeRecord.class, Cnd.where("id", "=", approvalParam.getProcessInstanceBusinessId()));
-            if (StrUtil.isNotEmpty(approvalParam.getApprovalRemark())) {
-                memberCommonService.dao().update(MemberChangeRecord.class, Chain.make("remark", approvalParam.getApprovalRemark()), Cnd.where("id", "=", record.getId()));
-            }
-            memberCommonService.compareChangeInfoAndUpdateMember(record);
-        }
-        bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, null);
-        return Result.success();
-    }
-
-
-    @At
-    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("member.change.schoolUnion.audit")
-    @SLog(type = "memberChange", tag = "会员变更", msg = "校工会批量审核")
-    public Object doBatchApproval(@Param("data") String[] ids){
-        if (ids.length == 0) {
-            return Result.error("未获取到选择数据");
-        }
-
-        for (String id : ids) {
-            BpmProcessInstance committeeInstance = dao.fetch(BpmProcessInstance.class, Cnd.where("processInstanceBusinessId", "=", id));
-            BpmProcessTask committeeTask = dao.fetch(BpmProcessTask.class, Cnd.where(BpmProcessTask::getProcessInstanceId, "=", committeeInstance.getId())
-                    .desc(BpmProcessTask::getCreatedAt));
-
-            BpmTaskApprovalParam committeeParam = new BpmTaskApprovalParam();
-            committeeParam.setProcessInstanceId(committeeInstance.getId());
-            committeeParam.setProcessInstanceBusinessId(id);
-            committeeParam.setProcessInstanceTaskId(committeeTask.getId());
-            committeeParam.setBpmTaskApprovalType(BpmTaskApprovalTypeEnum.PASS.name());
-            committeeParam.setBpmTaskApprovalTypeEnum(BpmTaskApprovalTypeEnum.PASS);
-            committeeParam.setApprovalOpinion("校工会审核通过");
-
-            memberCommonService.compareChangeInfoAndUpdateMember(committeeParam.getProcessInstanceBusinessId());
-            bpmService.completeTask(committeeParam.getProcessInstanceTaskId(), committeeParam.getBpmTaskApprovalTypeEnum(), null, null);
-        }
-
-        return Result.success();
-    }
-
-
-
-
-    @At
-    @ApiOperation("校工会审核撤回")
-    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("member.change.schoolUnion.audit")
-    @SLog(tag = "会员管理-校工会管理", type = "memberSchoolUnionAudit", msg = "校工会审核撤回")
-    public Result revoke(@Valid String taskId) {
-        bpmService.revokeTask(taskId);
-
-        // 审核通过的撤回，要将数据也改变回去
-        BpmProcessTask oldTask = dao.fetch(BpmProcessTask.class, taskId);
-        BpmProcessInstance fetch = dao.fetch(BpmProcessInstance.class, oldTask.getProcessInstanceId());
-        String businessId = fetch.getProcessInstanceBusinessId();
-
-        // 先查询历史记录，然后再把历史记录赋值给现在数据库存储的记录
-        Sys_user_history history = dao.fetch(Sys_user_history.class, Cnd.where(Sys_user_history::getRecordId, "=", businessId));
-        Sys_user info = dao.fetch(Sys_user.class, Cnd.where(Sys_user::getLoginname, "=", history.getLoginname()));
-
-        String userId = info.getId();
-        BeanUtil.copyProperties(history, info);
-        info.setId(userId);
-        dao.update(info);
-        dao.delete(history);
-
-        return Result.success();
-    }
-
 }
@@ -0,0 +1,117 @@
+package com.budwk.app.zhgh.staffmanage.member.controller.change;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.web.controllers.open.commons.service.CommonService;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberChangePageForm;
+import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：MemberUnionGroupAuditController
+ * @Date 2025/9/29 11:12
+ * @注释 会员变更，工会小组审核
+ */
+@Slf4j
+@IocBean
+@Ok("json")
+@At("/platform/member/change/unionGroup/audit")
+public class MemberUnionGroupAuditController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private CommonService commonService;
+    @Inject
+    private MemberCommonService memberCommonService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/change/uniongroupaudit/index.html")
+    @SaCheckPermission("member.change.unionGroup.audit")
+    public void index() {
+    }
+
+    @At
+    @ApiModelProperty("会员变更申请,工会小组审核列表")
+    @SaCheckPermission("member.change.unionGroup.audit")
+    public Result pageData(MemberChangePageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.id,
+                    info.sex,
+                    info.userName,
+                    info.loginName,
+                    info.unitName,
+                    info.unionName,
+                    info.userState,
+                    info.preparedBy,
+                    info.personType,
+                    info.changeTypes,
+                    info.applyDateTime,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    t.variable taskVariable,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                    IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                    wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN member_change_record info ON info.id = ins.businessNo
+                    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();
+        pageForm.buildSearch(cnd, "info.");
+
+        cnd.and("t.taskName", "=", "cbe2a530-b806-467d-88ac-5defb058d403");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (pageForm.getAudit()) {
+            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.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
+            cnd.desc("info.applyDateTime");
+        } else {
+            cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+        Pagination<NutMap> pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        return Result.success().addData(pagination);
+    }
+}
@@ -0,0 +1,43 @@
+package com.budwk.app.zhgh.staffmanage.member.controller.check;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberCheckPageForm;
+import com.budwk.app.zhgh.staffmanage.member.service.MemberCheckTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberCheckTaskSchoolController
+ * @Date 2025/9/26 15:31
+ * @注释 校工会核对
+ */
+@Slf4j
+@IocBean
+@Ok("json")
+@At("/platform/member/checkTask/school")
+public class MemberCheckTaskSchoolController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private MemberCheckTaskService memberCheckTaskService;
+
+    @At("")
+    @Ok("beetl:/platform/zhgh/staffmanage/member/check/school/index.html")
+    @SaCheckPermission("member.checkTask.school")
+    public void index() {}
+
+    @At
+    @SaCheckPermission("member.checkTask.school")
+    public Result pageData(MemberCheckPageForm pageForm) {
+
+        return Result.success();
+    }
+}
@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.staffmanage.member.interceptor;
+
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.sys.models.Sys_config;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：MemberApplyUnionGroupApprovalInterceptor
+ * @Date 2025/9/29 11:32
+ * @注释
+ */
+public class MemberApplyUnionGroupApprovalInterceptor implements FlowInterceptor {
+
+    @Override
+    public void intercept(Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        // 是否需要分工会审核
+        Sys_config config = dao.fetch(Sys_config.class, Cnd.where(Sys_config::getConfigKey, "=", "UnionGroupIsNeedBranchAudit"));
+        if ("true".equals(config.getConfigValue())) {
+            // 需要，流转到分工会审核
+            execution.getArgs().set("groupAuditNext", "branchAudit");
+        } else {
+            // 不需要，流转到校工会审核
+            execution.getArgs().set("groupAuditNext", "schoolAudit");
+        }
+
+    }
+}
@@ -0,0 +1,33 @@
+package com.budwk.app.zhgh.staffmanage.member.interceptor;
+
+import com.budwk.app.flow.engine.FlowInterceptor;
+import com.budwk.app.flow.engine.core.Execution;
+import com.budwk.app.flow.engine.core.ServiceContext;
+import com.budwk.app.sys.models.Sys_config;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name：MemberChangeUnionGroupApprovalInterceptor
+ * @Date 2025/9/29 11:32
+ * @注释
+ */
+public class MemberChangeUnionGroupApprovalInterceptor implements FlowInterceptor {
+
+    @Override
+    public void intercept(Execution execution) {
+        Dao dao = ServiceContext.find(Dao.class);
+        // 是否需要分工会审核
+        Sys_config config = dao.fetch(Sys_config.class, Cnd.where(Sys_config::getConfigKey, "=", "UnionGroupIsNeedBranchAudit"));
+        if ("true".equals(config.getConfigValue())) {
+            // 需要，流转到分工会审核
+            execution.getArgs().set("groupAuditNext", "branchAudit");
+        } else {
+            // 不需要，流转到校工会审核
+            execution.getArgs().set("groupAuditNext", "schoolAudit");
+        }
+
+    }
+}
@@ -66,8 +66,10 @@ public class MemberManagePageForm extends PageForm {
        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
            if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {
                cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
+            } else if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_GROUP_LEADER.name())) {
+                cnd.and("u.unionGroupId", "=", SecurityUtil.getUnionGroupId());
            } else {
-                cnd.and("record.userId", "=", SecurityUtil.getUserId());
+                cnd.and("u.id", "=", SecurityUtil.getUserId());
            }
        } else {
            cnd.andEX("u.unionId", "=", pageForm.getUnionId());
@@ -405,7 +405,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
    }

    @Override
-    public List<NutMap> getAllChangeInfo(String userId) {
+    public List<NutMap>  getAllChangeInfo(String userId) {
        List<NutMap> resultMapList = new ArrayList<>();

        Sql sql = Sqls.fetchString(Sqls.create("select loginname from sys_user where id = @id").setParam("id", userId).toString());