Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -54,7 +54,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>917]);
+        $list = $projectModel->list(['id'=>['in',[358,951]]]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -38,7 +38,8 @@ class SuppliersController extends BaseController
         $lists = $purchaserModel->list($this->map);
         $lists = $purchaserModel->list($this->map);
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
-                $resultData = json_decode($v['data']);
+                if(!empty($v['data'])){
+                    $resultData = json_decode($v['data'],true);
                     foreach ($resultData as $value){
                     foreach ($resultData as $value){
                         $value = (array)$value;
                         $value = (array)$value;
                         $value['keyword'] = $v['keyword'];
                         $value['keyword'] = $v['keyword'];
@@ -46,6 +47,7 @@ class SuppliersController extends BaseController
                     }
                     }
                 }
                 }
             }
             }
+        }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }