From 409ff2e0bbd6256f3b30abf06360570ef08d9b7c Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Tue, 18 Feb 2025 19:20:05 +0800
Subject: [PATCH] commit

---
 .../platform/sys/club/applyIn/ClubApplyAuditController.java   | 4 ++++
 .../platform/sys/club/applyIn/ClubApplyInController.java      | 2 +-
 .../platform/sys/handler/ClubUserApplyToDoHandler.java        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java
index 773e6bb..3a56149 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java
@@ -190,6 +190,10 @@ public class ClubApplyAuditController {
             sysClubUserService.dao().execute(sql);
             Record userRecord = (Record) sql.getResult();
             if (flag) {
+
+                ClubUserApplyToDoHandler.COMPLETE_CLUB_TASK.exec(clubUser);
+                ClubUserApplyToDoHandler.COMPLETE_PROCESS.exec(clubUser);
+
                 String content = "您申请加入的" + club.getName() + "已经审批通过。";
                 System.out.println(userRecord.getString("username"));
                 System.out.println(userRecord.getString("loginname"));
diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java
index 4e5ca8a..3725676 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java
@@ -184,7 +184,7 @@ public class ClubApplyInController {
         sys_club_user.setGiveMoney(true);
         Sys_club_user clubUser = sysClubUserService.insert(sys_club_user);
 
-        if(sys_club_user.getStatus() != 5) {
+        if(!isInvite && sys_club_user.getStatus() != 5) {
             //插入后，发起待办流程
             ClubUserApplyToDoHandler.START_PROCESS.exec(clubUser);
             //发任务给协会会长
diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/handler/ClubUserApplyToDoHandler.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/handler/ClubUserApplyToDoHandler.java
index dc5d66f..a506330 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/handler/ClubUserApplyToDoHandler.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/handler/ClubUserApplyToDoHandler.java
@@ -101,7 +101,8 @@ public enum ClubUserApplyToDoHandler {
                     GROUP BY
                         sur.userId
                     """);
-            sqlStr.setCondition(Cnd.NEW().and("sur.roleId", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)));
+            sqlStr.setCondition(Cnd.NEW().and("sur.roleId", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04))
+                    .and("clubId", "=", clubUser.getClubid()));
             Sql sql = Sqls.queryString(sqlStr.toString());
             dao.execute(sql);
             List<String> loginNames = sql.getList(String.class);