|
@@ -6,6 +6,7 @@ use app\common\model\ComjobsCate;
|
|
|
use app\common\model\RensheCode;
|
|
|
use app\common\model\UserTags;
|
|
|
use app\common\model\UserWill;
|
|
|
+use app\common\model\WorkerGroup;
|
|
|
use think\facade\Session;
|
|
|
use app\worker\BaseController;
|
|
|
use app\common\model\User as UserModel;
|
|
@@ -126,7 +127,9 @@ class User extends BaseController
|
|
|
$workerid = $this->access_worker['id'];
|
|
|
$groupslist = UserGroupsModel::order(['isdefault' => 'desc', 'id' => 'asc'])->select();
|
|
|
$agentlist = AgentModel::with('broker')->where('workerid', '=', $workerid)->order(['id' => 'desc'])->select();
|
|
|
+ $grouplist = WorkerGroup::where('workerid', $workerid)->select();
|
|
|
return view('user/userlist', [
|
|
|
+ 'grouplist' => $grouplist,
|
|
|
'groupslist' => $groupslist,
|
|
|
'agentlist' => $agentlist,
|
|
|
]);
|
|
@@ -139,19 +142,20 @@ class User extends BaseController
|
|
|
if (empty($agentlist)) {
|
|
|
return '没有权限';
|
|
|
}
|
|
|
- $agentidarr = $agentlist->column('id');
|
|
|
- $brokerlist = BrokerModel::whereIn('agentid', $agentidarr)->select();
|
|
|
+ $agentidarr = $agentlist->column('id');
|
|
|
+ $brokerlist = BrokerModel::whereIn('agentid', $agentidarr)->select();
|
|
|
if (empty($brokerlist)) {
|
|
|
return '没有权限';
|
|
|
}
|
|
|
$id = input('id/d', 0);
|
|
|
- $brokeridarr = $brokerlist->column('id');
|
|
|
+ $brokeridarr = $brokerlist->column('id');
|
|
|
$user = UserModel::whereIn('brokerid', $brokeridarr)->findOrEmpty($id);
|
|
|
$groupslist = UserGroupsModel::order(['isdefault' => 'desc', 'id' => 'asc'])->select();
|
|
|
$willlist = UserWill::select();
|
|
|
$usertags = UserTags::select();
|
|
|
$emptimelist = RensheCode::getList('emp_time');
|
|
|
$communitylist = RensheCode::getList('community')->toArray();
|
|
|
+ $grouplist = WorkerGroup::where('workerid', $workerid)->select();
|
|
|
array_push($communitylist, ['code' => 0, 'id' => 0, 'name' => "不限"]);
|
|
|
$comlist = ComjobsCate::select();
|
|
|
return view('user/userform', [
|
|
@@ -164,6 +168,7 @@ class User extends BaseController
|
|
|
'emptimelist' => $emptimelist,
|
|
|
'communitylist' => $communitylist,
|
|
|
'comlist' => $comlist,
|
|
|
+ 'grouplist' => $grouplist,
|
|
|
]);
|
|
|
}
|
|
|
|
|
@@ -209,7 +214,15 @@ class User extends BaseController
|
|
|
if (!empty($status)) {
|
|
|
$map[] = ['status', '=', $status];
|
|
|
}
|
|
|
- $list = UserModel::with(['userGroups', 'broker' => ['agent', 'worker']])->where($map)->order('id', 'desc')->limit($limit)->page($page)->append(['status_text', 'isvip_text', 'authstatus_text', 'followstatus_text'])->select();
|
|
|
+ $groupsid = input('groupsid/d');
|
|
|
+ if (!empty($groupsid)) {
|
|
|
+ $map[] = ['groupsid', '=', $groupsid];
|
|
|
+ }
|
|
|
+ $groupid = input('groupid/d');
|
|
|
+ if (!empty($groupid)) {
|
|
|
+ $map[] = ['groupid', '=', $groupid];
|
|
|
+ }
|
|
|
+ $list = UserModel::with(['userGroups', 'workerGroup', 'broker' => ['agent', 'worker']])->where($map)->order('id', 'desc')->limit($limit)->page($page)->append(['status_text', 'isvip_text', 'authstatus_text', 'followstatus_text'])->select();
|
|
|
$count = UserModel::where($map)->count();
|
|
|
if ($count == 0) {
|
|
|
exit(json_encode([
|
|
@@ -307,6 +320,7 @@ class User extends BaseController
|
|
|
$brokerid = isset($agentbrokerarr[1]) ? $agentbrokerarr[1] : 0;
|
|
|
$data = [
|
|
|
'groupsid' => input('groupsid/d', 0),
|
|
|
+ 'groupid' => input('groupid/d', 0),
|
|
|
'brokerid' => $brokerid,
|
|
|
'nickname' => input('nickname/s', ""),
|
|
|
'avatar' => input('avatar/s', ""),
|
|
@@ -353,7 +367,7 @@ class User extends BaseController
|
|
|
} else {
|
|
|
$data['id'] = $id;
|
|
|
UserModel::update($data);
|
|
|
- $adata = ['identifier' => $mobile];
|
|
|
+ $adata = ['identifier' => $mobile];
|
|
|
if (!empty($password)) {
|
|
|
$adata['password'] = md5($password);
|
|
|
}
|