转勤

application/index/service/BrokerService.php

@@ -60,6 +60,7 @@ class BrokerService
             return $result;
         }
         $field = 'id,name,phone,sex,img,status,inviter_id,admin_off,quit_time,password,site_id,district_id,store_id,auth_group_id,level';
+        $agent_old = $this->m_agent->getAgentById($field, ['phone' => $data['phone'], 'status' => 0]);
         if (empty($data['id'])) {
             $where['phone'] = $data['phone'];
             $where['site_id'] = $data['site_id'];
@@ -69,7 +70,7 @@ class BrokerService
                 $result['msg'] = '该用户已存在';
                 return $result;
             }
-            $agent_old = $this->m_agent->getAgentById($field, ['phone' => $data['phone'], 'status' => 0]);
+
             if (empty($data['confirm_old']) && (!empty($agent_old[0]['id']) || $agent_data['status'] == 3)) {
                 $result['msg'] = '转勤';
                 return $result;
@@ -116,13 +117,15 @@ class BrokerService
             }
         }
 
-        if ($is_new_id) {
+        if ($is_new_id && $data['confirm_old']) {
             $change_old_id = $agent_old[0]['id'];
-            $id = $this->m_agent->saveAgent($data);
 
             if (!empty($agent_old[0]['id'])) {
                 $this->m_agent->saveAgent(['id'=>$agent_old[0]['id'],'status'=>3]);
             }
+
+            unset($data['id']);
+            $id = $this->m_agent->saveAgent($data);
         } elseif ($agent_data['status'] == 3) {
             $change_old_id = $agent_old[0]['id'];
             $id = $this->m_agent->saveAgent(['id'=>$agent_data['id'],'status'=>0]);