Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -813,8 +813,16 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
-        if (!$spread_account || !$id){
-            return app('json')->fail('参数丢失');
+        $uid = $this->request->param('uid');
+        $spread_uid = Db::name("user")->where('uid', $uid)->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("修改成功");
@@ -845,8 +853,18 @@ class User extends BaseController
     public function changeProLevel($id,UserRepository $repository)
     {
         $level_account = $this->request->param('level_account');
-        if (!$level_account || !$id){
-            return app('json')->fail('参数丢失');
+        $uid = $this->request->param('uid');
+        $level_uid = Db::name("user")->where('uid', $uid)->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("修改成功");