Merge remote-tracking branch 'origin/main'

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubUnitPartAuditController.java

@@ -79,6 +79,7 @@ public class ClubUnitPartAuditController {
         audit = dao.insert(audit);
         Sys_club club = dao.fetch(Sys_club.class, clubId);
 
+        ClubRegisterApplyToDoHandler.COMPLETE_UNION_TASK.exec(club, NutMap.NEW().addv("nodeName","分工会完成审核"));
         if (pass == 1) {
             club.setState(ClubRegistAuditState.UNIT_PART_REJECTED);
             //分工会审核拒绝

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXTAuditController.java

@@ -76,6 +76,7 @@ public class ClubXTAuditController {
         audit = dao.insert(audit);
         Sys_club club = dao.fetch(Sys_club.class, clubId);
 
+        ClubRegisterApplyToDoHandler.COMPLETE_XT_SCHOOL_TASK.exec(club, NutMap.NEW().addv("nodeName","校工会办公室主管完成审核"));
         if (pass == 1) {
             club.setState(ClubRegistAuditState.XT_REJECTED);
             //校工会办公室主管审核拒绝

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java

@@ -89,6 +89,7 @@ public class ClubXghReplyController {
         audit = dao.insert(audit);
         Sys_club club = dao.fetch(Sys_club.class, clubId);
 
+        ClubRegisterApplyToDoHandler.COMPLETE_PROCESS.exec(club, NutMap.NEW().addv("nodeName", "校工会完成审核"));
         if (pass == 1) {
             club.setState(ClubRegistAuditState.XGH_REJECTED);
             dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId)

src/main/java/io/v/nutz/sys/controllers/platform/sys/handler/ClubRegisterApplyToDoHandler.java

@@ -184,7 +184,7 @@ public enum ClubRegisterApplyToDoHandler {
         @Override
         public void exec(Sys_club club, NutMap extra) {
             // 获取校工会会员管理员
-            Sys_role sysRole = sysRoleService.getByCode("SchoolUnionAdmin");
+            Sys_role sysRole = sysRoleService.getByCode("xxhgly");
             List<String> assignments =  sysUserRoleService.queryRoleUserLogin(sysRole.getId());
             localProcessService.createTask(
                     "CLUB_APPLY@" + club.getId(),