优化结果查询

application/admin/controller/Entrust.php

@@ -461,7 +461,9 @@ class Entrust extends Backend
         $params[$ke]['userid'] = Session::get('admin')['id'];;
         $params[$ke]['status'] = 0;
         $params[$ke]['work_unit'] = $entrust['work_unit'];
+        $params[$ke]['sample_info'] = $entrust['sample_info'];
         $params[$ke]['work_name'] = $entrust['work_name'];
+        $params[$ke]['send_sample'] = $entrust['send_sample'];
 //            $entrust_update[$ke]['standard_id'] = $temp_id[$ke];
 //            $entrust_update[$ke]['standard_name'] = $judge[0]['name'];
         $entrust_update[$ke]['status'] = 2;

application/admin/controller/Res.php

@@ -19,7 +19,7 @@ class Res extends Backend
      * @var \app\admin\model\Res
      */
     protected $model = null;
-    protected $searchFields = 'entrust_no,name,bach,standard_name';
+    protected $searchFields = 'entrust_no,name,bach,standard_name,sample_info,send_sample';
     public function _initialize()
     {
         parent::_initialize();
@@ -55,7 +55,7 @@ class Res extends Backend
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
         $user_id = Session::get('admin')['id'];
         if ($user_id == 1){//超级管理员
-            $list = $this->model
+            $list = $this->model->alias('a')
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);