Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -805,7 +805,7 @@ class User extends BaseController
 
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
         if ($spreadId) {
-            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->findOrEmpty()->toArray();
+            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->findOrEmpty();
         } else {
             $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
         }
@@ -846,7 +846,7 @@ class User extends BaseController
 
         $levelId = Db::name('user')->where('uid', $id)->value('level_id');
         if ($levelId) {
-            $level_message = Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->findOrEmpty()->toArray();
+            $level_message = Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->findOrEmpty();
         } else {
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
@@ -884,15 +884,11 @@ class User extends BaseController
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
 
-        $formData = formToData($this->repository->changeProFormLevel($id));
+        $formData = formToData($this->repository->changeProFormusergroup($id));
 
-        $levelId = Db::name('user')->where('uid', $id)->value('level_id');
-        if ($levelId) {
-            $level_message = Db::name('user')->where('uid', $levelId)->field('uid,account,nickname')->find();
-        } else {
-            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
-        }
-        return app('json')->success(array_merge($formData, ['level_message' => $level_message]));
+        $userGroup = Db::name('user')->where('uid', $id)->value('user_group');
+
+        return app('json')->success(array_merge($formData));
     }
 
     /**