后台-修改推荐人节点人-(beta)新增展示用户原推荐人和节点人

app/controller/admin/user/User.php

@@ -801,7 +801,15 @@ class User extends BaseController
     {
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
-        return app('json')->success(formToData($this->repository->changeProForm($id)));
+        $formData = formToData($this->repository->changeProFormLevel($id));
+
+        $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
+        if ($spreadId) {
+            $level_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
+        } else {
+            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+        }
+        return app('json')->success(['form' => $formData, 'level_message' => $level_message]);
     }
 
 
@@ -813,16 +821,6 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
-        $spread_uid = Db::name("user")->where('uid', $id)->value("spread_uid");
-        if ($spread_uid) {
-            $spread_message = Db::name("user")->where('uid', $spread_uid)->field("uid,account,nickname")->find();
-        } else {
-            $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
-        }
-
-        if (!$spread_account || !$id) {
-            return app('json')->success("获取成功", ['spread' => $spread_message]);
-        }
         if($repository->update_spread($id,$spread_account)){
             return app('json')->success("修改成功");
         }else{
@@ -844,22 +842,13 @@ class User extends BaseController
 
         $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();
+        $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' => '无节点人'
-            ];
+            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
-
-        $result = array_merge($formData, $level_message);
-
-        return app('json')->success($result);
+        return app('json')->success(['form' => $formData, 'level_message' => $level_message]);
     }