Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -842,22 +842,25 @@ class User extends BaseController
         if (!$this->repository->exists($id)) {
             return app('json')->fail('数据不存在');
         }
-        $groupId = Db::name("user")->where('uid', $id)->value("group_id");
+
+        $groupId = Db::name('user')->where('uid', $id)->value('group_id');
         if ($groupId) {
-            $level_message = Db::name("user")
-                ->where('uid', $groupId)
-                ->field("uid,account,nickname")
-                ->find();
+            $level_message = Db::name('user')->where('uid', $groupId)->field('uid,account,nickname')->find();
         } else {
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
+
         $formData = formToData($this->repository->changeProFormLevel($id));
-        $formData['level'] = $level_message;
-        return app('json')->success($formData);
+
+        return app('json')->success([
+            'formData' => $formData,
+            'level'    => $level_message
+        ]);
     }
 
 
 
+
     /*
      * 更改用户节点人信息
      * cabbage