up - 扩大查询

app/adminapi/lists/master_worker/MasterWorkerLists.php

@@ -171,8 +171,8 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             $distanceWhereSql .= ' and is_disable=0  AND work_status=0  AND accept_order_status=1 and service_area_id = '.$this->service_area_id;
         }
         $list = MasterWorker::alias('mw')
-            ->join('master_worker_register mwr', 'mwr.worker_id = mw.id')
-            ->join('master_worker_score mws', 'mws.worker_id = mw.id')
+            ->leftJoin('master_worker_register mwr', 'mwr.worker_id = mw.id')
+            ->leftJoin('master_worker_score mws', 'mws.worker_id = mw.id')
             ->where($this->searchWhere)
             ->where($queryWhere)
             ->where($this->queryDataWhere())

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -248,7 +248,7 @@ class MasterWorkerLogic extends BaseLogic
             $info['is_up_retention_pay'] = 1;
         }
         $info['score'] = MasterWorkerScore::where(['worker_id' => $params['id']])->field('comprehensive_score,weight_score')->findOrEmpty()->toArray();
-        $images = MasterWorkerCredentialImages::where(['worker_register_id' => $info['workerRegister']['worker_register_id']])->select()->toArray();
+        $images = MasterWorkerCredentialImages::where(['worker_register_id' => $info['workerRegister']['worker_register_id']??-1])->select()->toArray();
         $info['credential_info'] = $images;
         return $info;
     }