后台-用户推荐节点身份修改记录展示/用户上下级展示-all beta

app/common/repositories/user/UserRepository.php

@@ -3114,13 +3114,13 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$mark,$old_spread_id){
+    public function update_spread($uid,$spread_account,$mark,$account){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
-        //$old_spreadId = Db::name("user")->where('account',$spreadId)->value('uid');
+        $spreadId = Db::name("user")->where('account',$account)->value('uid');
         if($spread){
             try{
                 $data= Db::name("user")->where(["uid"=>$uid])->update(['spread_uid'=>$spread['uid']]);
@@ -3133,7 +3133,7 @@ class UserRepository extends BaseRepository
                 Db::name("rrx_user_spread_change_records")->insert([
                     'operation_id' => 1,
                     'uid' => $uid,
-                    'old_spread_id' => $old_spread_id,
+                    'old_spread_id' => $spreadId,
                     'new_spread_id' => $spread['uid'],
                     'mark' => $mark
                 ]);

app/controller/admin/user/User.php

@@ -814,10 +814,12 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
+        $spread_account_old = $this->requet->param('spread_account_old');
+        $account = explode('(', $spread_account_old)[0];
         $mark = '后台管理员修改用户推荐人';
         $spreadId = $this->request->param('old_spread_account');
         $old_spread_id = Db::name('user')->where('account', $spreadId)->value('uid');
-        if($repository->update_spread($id,$spread_account,$mark,$old_spread_id)){
+        if($repository->update_spread($id,$spread_account,$mark,$account)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");