diff --git a/admin/controllers/app/licheb/Member.php b/admin/controllers/app/licheb/Member.php index 4d9ca3d7..1527d11d 100755 --- a/admin/controllers/app/licheb/Member.php +++ b/admin/controllers/app/licheb/Member.php @@ -251,6 +251,7 @@ class Member extends HD_Controller $status = $this->input->post('status'); $page = $this->input->post('page'); $size = $this->input->post('size'); + $type = intval($this->input->post('type')); $where = array(); if (strlen($status) > 0) { @@ -259,24 +260,35 @@ class Member extends HD_Controller $whre['status > -1'] = null; } $biz_id && $where['biz_id'] = $biz_id; - $total = $this->userM->count($where); - - $lists = array(); + $lists = $uids = array(); if ($total) { - $orderby = 'id desc'; - $select = 'id,uname'; - $rows = $this->userM->select($where, $orderby, $page, $size, $select); - + $rows = $this->userM->select($where, 'id desc', $page, $size, 'id,uname'); foreach ($rows as $v) { + $uids[$v['id']] = $v['id']; $lists[] = array( 'id' => $v['id'], 'title' => $v['uname'], ); } } - - $this->data = array('total' => $total, 'list' => $lists); + if ($type == 1) {//查找渠道经理 + $where2 = ['status' => 1, 'group_id' => 4]; + $where2["id in(select uid from lc_app_licheb_channel_biz where biz_id = {$biz_id})"] = null; + $total2 = $this->userM->count($where2); + if ($total2) { + $rows2 = $this->userM->select($where2, 'id desc', $page, $size, 'id,uname'); + foreach ($rows2 as $v) { + if (!$uids[$v['id']]) { + $lists[] = array( + 'id' => $v['id'], + 'title' => $v['uname'] . '(渠道)', + ); + } + } + } + } + $this->data = array('total' => $total, 'list' => $lists, 'list2' => $rows2); return $this->show_json(SYS_CODE_SUCCESS); } diff --git a/admin/views/items/transfer/get_add.php b/admin/views/items/transfer/get_add.php index 059186c5..2abfa5b6 100644 --- a/admin/views/items/transfer/get_add.php +++ b/admin/views/items/transfer/get_add.php @@ -304,7 +304,7 @@ -
+