diff --git a/home/controllers/h5/market/Draw.php b/home/controllers/h5/market/Draw.php
index 3d61f1bf..b96e4d62 100644
--- a/home/controllers/h5/market/Draw.php
+++ b/home/controllers/h5/market/Draw.php
@@ -49,8 +49,10 @@ class Draw extends CI_Controller
             $winTypeAry = [];//抽奖类型
             $winTypeAryGet = $this->mdSyliveOrder->winTypeAry($activityId);
             foreach ($winTypeAryGet as $k => $v) {
-                $title = $v['merge'] ? $v['tag'] . ' ' . $v['title'] : $v['title'];
-                $winTypeAry[] = ['title' => $title, 'value' => $k];
+                if ($k != 7) {
+                    $title = $v['merge'] ? $v['tag'] . ' ' . $v['title'] : $v['title'];
+                    $winTypeAry[] = ['title' => $title, 'value' => $k];
+                }
             }
             $title = $re['title'] . '_私域直播抽奖';
             $bgImg = "background-image:url('{$drawConfig['bgImg']}')";
diff --git a/market/controllers/api/sylive/Members.php b/market/controllers/api/sylive/Members.php
index 05f9bf38..16764edb 100644
--- a/market/controllers/api/sylive/Members.php
+++ b/market/controllers/api/sylive/Members.php
@@ -27,12 +27,12 @@ class Members extends BaseController
         $page = $this->input_param('page');
         $limit = $this->input_param('limit');
         $uname = $this->input_param('uname');
-        $nickname = $this->input_param('nickname');
+        $mobile = $this->input_param('mobile');
         $sort = $this->input_param('sort');
         $order = $this->input_param('order');
         $organizationId = intval($this->input_param('organizationId'));
         $topOrgId = intval($this->input_param('topOrgId'));
-        $keyWord = $this->input_param('keyWord');
+        $keywords = $this->input_param('keywords');
         !$page && $page = 1;
         !$limit && $limit = 10;
         $sort_order = 'userId desc';
@@ -40,34 +40,65 @@ class Members extends BaseController
             $sort_order = $sort . ' ' . $order;
         }
         $list = $re_org = [];
-        $organizationType = 0;
         $roleAry = $this->mdSyliveUser->roleAry();
         $where['status>='] = 0;
-        if ($organizationId) {
-            $where['organizationId'] = $organizationId;
-            $re_org = $this->mdSyliveOrganization->get(['organizationId' => $organizationId]);
-        }
-        if ($topOrgId) {
-            $where['topOrgId'] = $topOrgId;
-            $re_org = $this->mdSyliveOrganization->get(['organizationId' => $topOrgId]);
-        }
+        $organizationId && $where['organizationId'] = $organizationId;
+        $topOrgId && $where['topOrgId'] = $topOrgId;
         $re_org && $organizationType = $re_org['organizationType'];
-        if ($keyWord) {
-            $where["(uname LIKE '%{$keyWord}%' OR mobile LIKE '%{$keyWord}%') OR nickname LIKE '%{$keyWord}%')"] = null;
+        if ($keywords) {
+            $where["(uname LIKE '%{$keywords}%' OR mobile LIKE '%{$keywords}%' OR nickname LIKE '%{$keywords}%')"] = null;
         } else {
-            $uname && $where['uname'] = $uname;
-            $nickname && $where['nickname'] = $nickname;
+            $uname && $where["uname LIKE '%{$uname}%'"] = $uname;
+            $mobile && $where["mobile LIKE '%{$mobile}%'"] = $mobile;
         }
         $count = $this->mdSyliveUser->count($where);
         if ($count) {
             $res = $this->mdSyliveUser->select($where, $sort_order, $page, $limit);
+            $maJiaIds = $organizationIds = $map_maJia = $map_organization = [];
             foreach ($res as $v) {
+                $v['maJiaId'] && !in_array($v['maJiaId'], $maJiaIds) && $maJiaIds[] = $v['maJiaId'];
+                $v['organizationId'] && !in_array($v['organizationId'], $organizationIds) && $organizationIds[] = $v['organizationId'];
+                $v['bizId'] && !in_array($v['bizId'], $organizationIds) && $organizationIds[] = $v['bizId'];
+                $v['topOrgId'] && !in_array($v['topOrgId'], $organizationIds) && $organizationIds[] = $v['topOrgId'];
+            }
+            if ($maJiaIds) {
+                $str_maJiaIds = implode(",", $maJiaIds);
+                $map_maJia = $this->mdSyliveUser->map('userId', 'uname,nickname,mobile', ["userId in({$str_maJiaIds})" => null]);
+            }
+            if ($organizationIds) {
+                $str_organizationIds = implode(",", $organizationIds);
+                $map_organization = $this->mdSyliveOrganization->map('organizationId', 'organizationName,organizationType'
+                    , ["organizationId in({$str_organizationIds})" => null]);
+            }
+            foreach ($res as $v) {
+                $maJiaId = $maJiaName = $organizationName = '';
+                $roleName = '客户';
+                $userId = intval($v['userId']);
                 $status = intval($v['status']);
+                $organizationId = intval($v['organizationId']);
                 $createTime = $v['createTime'] != '0000-00-00 00:00:00' ? $v['createTime'] : '';
-                $roleName = $roleAry[$organizationType] ? $roleAry[$organizationType] : '客户';
-                $list[] = [
-                    'userId' => $v['userId'], 'uname' => $v['uname'], 'nickname' => $v['nickname'], 'mobile' => $v['mobile']
-                    , 'roleName' => $roleName, 'organizationId' => $organizationId, 'status' => $status, 'createTime' => $createTime];
+                if ($map_organization[$organizationId]) {
+                    $organizationType = $map_organization[$organizationId]['organizationType'];
+                    $roleName = $roleAry[$organizationType] ? $roleAry[$organizationType] : '客户';
+                }
+                $organizationName = $map_organization[$v['topOrgId']]['organizationName'];
+                if ($map_organization[$v['bizId']]['organizationName']) {
+                    $organizationName = $organizationName ? $organizationName . '-' . $map_organization[$v['bizId']]['organizationName'] :
+                        $map_organization[$v['bizId']]['organizationName'];
+                } elseif ($map_organization[$v['organizationId']]['organizationName']) {
+                    $organizationName = $organizationName ? $organizationName . '-' . $map_organization[$v['organizationId']]['organizationName'] :
+                        $map_organization[$v['organizationId']]['organizationName'];
+                }
+                if ($v['maJiaId']) {
+                    $maJiaId = intval($v['maJiaId']);
+                    $maJiaName = $map_maJia[$maJiaId]['uname'] ? $map_maJia[$maJiaId]['uname'] : $map_maJia[$maJiaId]['nickname'];
+                    $maJiaName = $maJiaName ? $maJiaName . '(' . $map_maJia[$maJiaId]['mobile'] . ')' : $map_maJia[$maJiaId]['mobile'];
+                }
+                $maJiaShow = $v['uname'] ? $v['uname'] : $v['nickname'];
+                $maJiaShow = $maJiaShow ? $maJiaShow . '(' . $v['mobile'] . ')' : $v['mobile'];
+                $list[] = ['userId' => $userId, 'maJiaId' => $maJiaId, 'maJiaName' => $maJiaName, 'maJiaShow' => $maJiaShow,
+                    'uname' => $v['uname'], 'nickname' => $v['nickname'], 'mobile' => $v['mobile'], 'organizationName' => $organizationName,
+                    'roleName' => $roleName, 'organizationId' => $organizationId, 'status' => $status, 'createTime' => $createTime];
             }
         }
         $date = ['list' => $list, 'count' => $count];
@@ -170,6 +201,22 @@ class Members extends BaseController
         $this->return_response();
     }
 
+    /**
+     * Notes:修改马甲
+     * Created on: 2022/9/21 14:48
+     * Created by: dengbw
+     */
+    public function majia_put()
+    {
+        $userId = intval($this->input_param('userId'));
+        $maJiaId = intval($this->input_param('maJiaId'));
+        if (!$userId) {
+            $this->return_json('参数错误');
+        }
+        $this->mdSyliveUser->update(['maJiaId' => $maJiaId], ['userId' => $userId]);
+        $this->return_response();
+    }
+
     /**
      * Notes:修改状态
      * Created on: 2022/9/21 16:10