From d729c91f610c8902fcec2444df6cac7b1c2e1002 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 27 Nov 2025 21:06:20 +0800
Subject: [PATCH] 修复连盟管理PC端无法添加管理员的问题

---
 admin/app/common/model/branch/ActivityUser.php |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/admin/app/common/model/branch/ActivityUser.php b/admin/app/common/model/branch/ActivityUser.php
index 1f0ae24..d484aa3 100644
--- a/admin/app/common/model/branch/ActivityUser.php
+++ b/admin/app/common/model/branch/ActivityUser.php
@@ -184,13 +184,30 @@
     //判断用户是否报名
     public static function isReg($user_id, $activity_id)
     {
-        return !!(new static())->where('user_id', '=', $user_id)->where('status', '=', 1)->where('activity_id', '=', $activity_id)->count();
+        return !!(new static())->where('user_id', '=', $user_id)
+            ->where('status', '=', 1)
+            ->where('user_id <> reg_user_id')
+            ->where('activity_id', '=', $activity_id)
+            ->count();
+    }
+
+    //判断帮报的用户是否报名
+    public static function isRegByFriend($mobile, $activity_id)
+    {
+        return !!(new static())->where('mobile', '=', $mobile)
+            ->where('status', '=', 1)
+            ->where('is_friend', '=', 1)
+            ->where('activity_id', '=', $activity_id)
+            ->count();
     }
 
     //判断用户是否签到
     public static function isVerify($user_id, $activity_id)
     {
-        return !!(new static())->where('user_id', '=', $user_id)->where('is_verify', '=', 1)->where('activity_id', '=', $activity_id)->count();
+        return !!(new static())->where('user_id', '=', $user_id)
+            ->where('is_verify', '=', 1)
+            ->where('activity_id', '=', $activity_id)
+            ->count();
     }
 
     /**

--
Gitblit v1.9.2