Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -841,7 +841,19 @@ class User extends BaseController
     {
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
-        return app('json')->success(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();
+        } else {
+            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+        }
+        $formData = formToData($this->repository->changeProFormLevel($id));
+        foreach ($formData['rule'] as &$rule) {
+            if ($rule['field'] === 'level_account') {
+                $rule['value'] = $level_message['account'] ?? '';
+            }
+        }
+        return app('json')->success($formData);
     }
 
     /*
@@ -852,18 +864,9 @@ class User extends BaseController
     public function changeProLevel($id,UserRepository $repository)
     {
         $level_account = $this->request->param('level_account');
-        $level_uid = Db::name("user")->where('uid', $id)->value("group_id");
-        if ($level_uid) {
-            $level_message = Db::name("user")->where('uid', $level_uid)->field("uid,account,nickname")->find();
-        } else {
-            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
-        }
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if (!$level_account) {
-            return app('json')->success("获取成功", ['level' => $level_message]);
-        }
         if($repository->update_level_uid($id,$level_account)){
             return app('json')->success("修改成功");
         }else{