up - masterWorkerTeam

app/adminapi/logic/master_worker/MasterWorkerTeamLogic.php

@@ -76,11 +76,12 @@ class MasterWorkerTeamLogic extends BaseLogic
     {
         Db::startTrans();
         try {
+            $masterWorkerTeam = MasterWorkerTeam::where('id', $params['id'])->find();
             $masterWorker = \app\common\model\master_worker\MasterWorker::where('id', $params['master_worker_id'])->find();
-            if($masterWorker['team_id']){
+            if(($masterWorkerTeam['master_worker_id'] != $params['master_worker_id']) && $masterWorker['team_id']){
                 throw new \Exception('该师傅已加入团队，请先退出团队');
             }
-            $masterWorkerTeam = MasterWorkerTeam::where('id', $params['id'])->find();
+
             \app\common\model\master_worker\MasterWorker::where('id', $masterWorkerTeam['master_worker_id'])->update(
                 [
                     'team_id' => 0,