Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -3139,11 +3139,13 @@ class UserRepository extends BaseRepository
  //               }else{
  //                   Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
  //               }
+                $old_spread_id = $identity['spread_uid'];
+                $new_spread_id = $spread['uid'];
                 Db::name("rrx_user_spread_change_records")->insert([
                     'operation_id' => 1,
                     'uid' => $uid,
-                    'old_spread_id' => intval($identity['spread_uid'] ?? 0),
-                    'new_spread_id' => intval($spread['uid']),
+                    'old_spread_id' => $old_spread_id,
+                    'new_spread_id' => $new_spread_id,
                     'mark' => $mark
                 ]);
                 Db::name("user")->where('account',$spread_account)->inc("spread_count",1)->update();
@@ -3153,6 +3155,7 @@ class UserRepository extends BaseRepository
                 return $data;
             }catch (Exception $e) {
                 Db::rollback();
+                dump($e->getMessage());
             }
         }else{
             return false;

app/controller/admin/user/User.php

@@ -2072,11 +2072,14 @@ class User extends BaseController
     /**
      * 查询用户上下级
      */
-    public function getUserLevelList($id){
+    public function getUserLevelList($id)
+    {
         $uid = $id;
-        $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], '获取成功');
+        $query = Db::name('user')
+            ->where('level_id', $uid)
+            ->field('uid, account, nickname')
+            ->select()
+            ->toArray();
+        return app('json')->success($query, '获取成功');
     }
-
 }