|
|
@@ -860,20 +860,22 @@ class User extends BaseController
|
|
860
|
860
|
/**
|
|
861
|
861
|
* 更改用户身份
|
|
862
|
862
|
*/
|
|
863
|
|
- public function changeProusergroupfrom($id)
|
|
|
863
|
+ public function changeProUsergroupFrom($id)
|
|
864
|
864
|
{
|
|
865
|
865
|
if (!$this->repository->exists($id))
|
|
866
|
866
|
return app('json')->fail('数据不存在');
|
|
867
|
867
|
$formData = formToData($this->repository->changeProFormusergroup($id));
|
|
868
|
868
|
return app('json')->success(array_merge($formData));
|
|
869
|
869
|
}
|
|
870
|
|
- public function changeProusergroup($id,UserRepository $repository)
|
|
|
870
|
+ public function changeProUsergroup($id,UserRepository $repository)
|
|
871
|
871
|
{
|
|
872
|
872
|
$group_id = $this->request->param('group_id');
|
|
|
873
|
+ $adminid = $this->request->adminId();
|
|
|
874
|
+ $mark = $this->request->param('mark');
|
|
873
|
875
|
if (!$id) {
|
|
874
|
876
|
return app('json')->fail("参数丢失");
|
|
875
|
877
|
}
|
|
876
|
|
- if ($repository->update_user_group($id, $group_id)) {
|
|
|
878
|
+ if ($repository->update_user_group($id, $group_id,$adminid,$mark)) {
|
|
877
|
879
|
return app('json')->success("修改成功");
|
|
878
|
880
|
} else {
|
|
879
|
881
|
return app('json')->fail("失败");
|
|
|
@@ -2011,9 +2013,9 @@ class User extends BaseController
|
|
2011
|
2013
|
$records = Db::name('user_operating_record')
|
|
2012
|
2014
|
->alias('r')
|
|
2013
|
2015
|
->join('user u', 'r.uid = u.uid', 'LEFT')
|
|
2014
|
|
- ->field('r.*, u.phone,u.nickname')
|
|
2015
|
|
- ->order('create_time DESC')
|
|
2016
|
|
- ->select()
|
|
|
2016
|
+ ->field('r.*, u.phone, u.nickname')
|
|
|
2017
|
+ ->order('r.create_time DESC')
|
|
|
2018
|
+ ->paginate(20)
|
|
2017
|
2019
|
->toArray();
|
|
2018
|
2020
|
return app('json')->success($records, '获取成功');
|
|
2019
|
2021
|
}
|