Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -3140,7 +3140,7 @@ class UserRepository extends BaseRepository
  //                   Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
  //               }
                 Db::name("rrx_user_spread_change_records")->insert([
-                    'operation_id' => '1',
+                    'operation_id' => 1,
                     'uid' => $uid,
                     'old_spread_id' => $identity['spread_uid'],
                     'new_spread_id' => $spread['uid'],
@@ -3164,7 +3164,7 @@ class UserRepository extends BaseRepository
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([
-                    'operation_id' => '1',
+                    'operation_id' => 1,
                     'uid' => $uid,
                     'old_level_id' => $levelId,
                     'new_level_id' => $level['uid'],

app/controller/admin/user/User.php

@@ -847,7 +847,7 @@ class User extends BaseController
      * */
     public function changeProLevel($id,UserRepository $repository) {
         $level_account = $this->request->param('level_account');
-        $levelId = $this->request->levelId();
+        $levelId = $this->request->param->levelId();
         $mark = '后台管理员修改用户节点人';
         if (!$id) {
             return app('json')->fail("参数丢失");
@@ -2074,8 +2074,8 @@ class User extends BaseController
      */
     public function getUserLevelList($id){
         $uid = $id;
-        $records = Db::name('users')->where('uid',$uid)->field('level_id')->find();
-        $query = Db::name('users')->where('level_id',$uid)->field('uid')->select()->toArray();
+        $records = Db::name('user')->where('uid',$uid)->field('level_id')->find();
+        $query = Db::name('user')->where('level_id',$uid)->field('uid')->select()->toArray();
         return app('json')->success(['user_level' => $records, 'user_children' => $query], '获取成功');
     }