Merge branch 'dongxiaoqin_0220'

app/workerapi/logic/MasterWorkerLogic.php

@@ -283,8 +283,8 @@ class MasterWorkerLogic extends  BaseLogic
         if (empty($params['worker_id'])) {
             return false;
         }
-        $info = MasterWorkerInterview::where('worker_id',$params['worker_id'])
-                    ->field('id,worker_id,type,status,nickname,create_time')
+        $info = MasterWorkerInterview::where('worker_register_id',$params['worker_id'])
+                    ->field('id,worker_register_id,type,status,nickname,create_time')
                     ->select()
                     ->toArray();
         return $info;
@@ -296,7 +296,7 @@ class MasterWorkerLogic extends  BaseLogic
     {
         try {
             
-            if (empty($params['worker_id']) || empty($params['answer']) || empty($params['answer1']) || empty($params['answer2']) ) {
+            if (empty($params['worker_register_id']) || empty($params['answer']) || empty($params['answer1']) || empty($params['answer2']) ) {
                 return false;
             }
             if (!empty($params['answer7'])) {
@@ -315,26 +315,26 @@ class MasterWorkerLogic extends  BaseLogic
             }
 
             //校验一下工程师注册ID是否有效
-            $worker_register_id = $params['worker_id'];
+            $worker_register_id = $params['worker_register_id'];
             $worker_register_id = MasterWorkerRegister::where('id',$worker_register_id)->value('id');
             if (!$worker_register_id) {
                 return false;
             }
 
-            $info = MasterWorkerInterview::where('worker_id',$params['worker_id'])->value("id");
+            $info = MasterWorkerInterview::where('worker_register_id',$params['worker_register_id'])->value("id");
             if ($info) {
                 return false;
             }
             $params['nickname'] = isset($params['nickname']) ?? '';
             $insertData = [
                 'sys_uuid' => $params['sys_uuid'],
-                'worker_id' => $params['worker_id'],
+                'worker_register_id' => $params['worker_register_id'],
                 'nickname' => $params['nickname'],
                 'type' => $type,
                 'status' => $params['status'],
             ];
             unset($params['sys_uuid']);
-            unset($params['worker_id']);
+            unset($params['worker_register_id']);
             unset($params['nickname']);
             unset($params['status']);
             $insertData['content'] = json_encode($params);