Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -839,23 +839,27 @@ class User extends BaseController
      */
     public function changeProLevelForm($id)
     {
-        if (!$this->repository->exists($id)) {
+        if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
-        }
+
+        $formData = formToData($this->repository->changeProFormLevel($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' => '无节点人'];
+            $level_message = [
+                'uid' => null,
+                'account' => '无节点人',
+                'nickname' => '无节点人'
+            ];
         }
 
-        $formData = formToData($this->repository->changeProFormLevel($id));
+        $result = array_merge($formData, $level_message);
 
-        return app('json')->success([
-            'formData' => $formData,
-            'level'    => $level_message
-        ]);
+        return app('json')->success($result);
     }