Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -872,7 +872,7 @@ class UserRepository extends BaseRepository
             $level_message = ['account' => '无节点人', 'nickname' => '无节点人'];
         }
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
-            Elm::input('spread_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
+            Elm::input('level_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
             Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
         ])->setTitle('修改用户节点人（上级）');
     }
@@ -3124,7 +3124,7 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$mark,$spreadId){
+    public function update_spread($uid,$spread_account,$mark,$olld_id){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
@@ -3139,10 +3139,10 @@ class UserRepository extends BaseRepository
  //               }else{
  //                   Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
  //               }
-                Db::name("rrx_user_spread_change_records")->insert([
+                Db::name("user_spread_change_records")->insert([
                     'operation_id' => 1,
                     'uid' => $uid,
-                    'old_spread_id' => $spreadId,
+                    'old_spread_id' => $olld_id,
                     'new_spread_id' => $spread['uid'],
                     'mark' => $mark
                 ]);
@@ -3160,8 +3160,9 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $levelId, $level_account, $mark){
+    public function update_level_uid($uid, $account, $level_account, $mark){
         $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
+        $levelId = Db::name("user")->where('account',$account)->value("uid");
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([

app/controller/admin/user/User.php

@@ -814,9 +814,9 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
+        $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
         $mark = '后台管理员修改用户推荐人';
-        $spreadId = $this->request->param('spreadId');
-        if($repository->update_spread($id,$spread_account,$mark,$spreadId)){
+        if($repository->update_spread($id,$spread_account,$mark,$olld_id)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -848,12 +848,13 @@ class User extends BaseController
      * */
     public function changeProLevel($id,UserRepository $repository) {
         $level_account = $this->request->param('level_account');
-        $levelId = $this->request->param->levelId();
+        $level_account_old = $this->request->param('level_account_old');
+        $account = explode('(', $level_account_old)[0];
         $mark = '后台管理员修改用户节点人';
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if($repository->update_level_uid($id,$levelId,$level_account,$mark)){
+        if($repository->update_level_uid($id,$account,$level_account,$mark)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败"); }
@@ -2078,6 +2079,7 @@ class User extends BaseController
         $uid = $id;
         $query = Db::name('user')
             ->where('level_id', $uid)
+            ->where('is_del', 0)
             ->field('uid, account, nickname')
             ->select()
             ->toArray();