Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -3126,14 +3126,9 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId){
-        //推荐人信息
-        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
+    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId,$spread){
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
-        if (!$spread) {
-            return app('json')->fail("推荐人账号不存在");
-        }
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
         if($spread){
             try{
@@ -3165,11 +3160,7 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId){
-        $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
-        if (!$level) {
-            return false;
-        }
+    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId,$level){
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([

app/controller/admin/user/User.php

@@ -823,7 +823,11 @@ class User extends BaseController
         }
         $mark = $operation.$mark;
         $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
-        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId)){
+        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
+        if(!$spread){
+            return app('json')->fail("推荐人信息不存在");
+        }
+        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId,$spread)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -864,10 +868,14 @@ class User extends BaseController
             $mark = "($mark)";
         }
         $mark = $operation.$mark;
+        $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
+        if(!$level){
+            return app('json')->fail("节点人信息不存在");
+        }
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if($repository->update_level_uid($id,$olld_id,$level_account,$mark,$adminId)){
+        if($repository->update_level_uid($id,$olld_id,$level_account,$mark,$adminId,$level)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败"); }