Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -867,7 +867,7 @@ class UserRepository extends BaseRepository
         ])->setTitle('修改用户节点人（上级）');
     }
 
-    public function changeProFormusergroup($id)
+    public function changeProFormGroup($id)
     {
         return Elm::createForm(Route::buildUrl('systemUserChangeusergroupPro', compact('id'))->build(), [
             Elm::input('group_id', '新的用户身份')->required()->placeholder("请填写新的用户身份")

app/controller/admin/user/User.php

@@ -53,6 +53,7 @@ class User extends BaseController
      * @var UserRepository
      */
     protected $repository;
+    private $request;
 
     /**
      * User constructor.
@@ -860,14 +861,14 @@ class User extends BaseController
     /**
      * 更改用户身份
      */
-    public function changeProUsergroupFrom($id)
+    public function changeProGroupFrom($id)
     {
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
-        $formData = formToData($this->repository->changeProFormusergroup($id));
+        $formData = formToData($this->repository->changeProFormGroup($id));
         return app('json')->success(array_merge($formData));
     }
-    public function changeProUsergroup($id,UserRepository $repository)
+    public function changeProGroup($id,UserRepository $repository)
     {
         $group_id = $this->request->param('group_id');
         $adminid = $this->request->adminId();
@@ -2014,6 +2015,12 @@ class User extends BaseController
             ->alias('r')
             ->join('user u', 'r.uid = u.uid', 'LEFT')
             ->field('r.*, u.phone, u.nickname')
+            ->where(function ($query) {
+                $nickname = request()->param('nickname');
+                $account  = request()->param('account');
+                $nickname && $query->whereLike('u.nickname', "%{$nickname}%");
+                $account  && $query->whereLike('u.account', "%{$account}%");
+            })
             ->order('r.create_time DESC')
             ->paginate(20)
             ->toArray();

route/admin.php

@@ -374,8 +374,8 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('change_pro_level/form/:id', '/changeProLevelForm')->name('systemUserChangeProLevelForm');
             Route::post('change_pro_level/:id', '/changeProLevel')->name('systemUserChangeLevelPro');
             //修改用户身份
-            Route::get('change_pro_usergroup/form/:id', '/changeProUsergroupFrom')->name('systemUserChangeProUsergroupFrom');
-            Route::post('change_pro_usergroup/:id', '/changeProUsergroup')->name('systemUserChangeUsergroupPro');
+            Route::get('change_pro_group/form/:id', '/changeProGroupFrom')->name('systemUserChangeProGroupFrom');
+            Route::post('change_pro_group/:id', '/changeProGroup')->name('systemUserChangeGroupPro');
             //用户奖励变更
             Route::get('change_award/form/:id', '/changeAwardForm')->name('systemUserChangeAwardForm');
             Route::post('change_award/:id', '/changeAward')->name('systemUserChangeAward');
@@ -412,7 +412,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
 
 
 
-        })->prefix('admin.user.User')->middleware(AllowCrossDomain::class);
+        })->prefix('admin.user.User');
         Route::group('user/score', function () {
             Route::any('deduct/:uid', '/deduct')->name('systemUserScoreDeduct');
             Route::any('excel', '/excel')->name('systemUserScoreExcel');