From a90ac240c499e686793744b25732b6ac6a57edfd Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 26 Nov 2025 10:46:51 +0800
Subject: [PATCH] 1、商家端添加会员管理 2、修复分会绑定会长时获取获取会员信息报错 3、修复添加分会成员是没保存分会id问题 4、修复获取分会成员时获取的是所有的分会的成员

---
 admin/app/api/controller/branch/ActivityUser.php |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/admin/app/api/controller/branch/ActivityUser.php b/admin/app/api/controller/branch/ActivityUser.php
index 1bdac1d..9a5b58a 100644
--- a/admin/app/api/controller/branch/ActivityUser.php
+++ b/admin/app/api/controller/branch/ActivityUser.php
@@ -13,13 +13,24 @@
 class ActivityUser extends Controller
 {
     /**
-     * 活动报名列表
+     * 某活动报名的用户列表
      */
     public function lists()
     {
+        $model = new ActivityUserModel;
+        $list = $model->getListForActivity($this->postData(), true);
+        return $this->renderSuccess('', compact('list'));
+    }
+
+
+    /**
+     * 用户报名的活动列表
+     */
+    public function listsForUser()
+    {
         $user = $this->getUser();
         $model = new ActivityUserModel;
-        $list = $model->getList($user['user_id'], $this->postData());
+        $list = $model->getListForUser($user['user_id'], $this->postData());
         return $this->renderSuccess('', compact('list'));
     }
 

--
Gitblit v1.9.2