Merge branch 'develop' of 47.244.231.31:zhl/globalso-v6 into develop

@@ -614,6 +614,7 @@ class ProjectController extends BaseController
                   "domain" => $item['deploy_optimize']['domain'] ?? '',
                   "domain" => $item['deploy_optimize']['domain'] ?? '',
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "online_time" => $item['online_check']['qa_check_time'] ?? '',
                   "online_time" => $item['online_check']['qa_check_time'] ?? '',
+                  "cooperate_date" => $item['cooperate_date'],
             ];
             ];
             if ($item['type'] == 3) {
             if ($item['type'] == 3) {
                 $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;
                 $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;

@@ -167,7 +167,7 @@ class CNoticeController extends BaseController
             'current_num'=>0,
             'current_num'=>0,
             'type'=>$type,
             'type'=>$type,
             'page'=>$page,
             'page'=>$page,
-            'extends'=>$extend,
+            'extends'=>!empty($extend) ? $extend : json_encode([]),
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'created_at'=>date('Y-m-d H;i:s')
             'created_at'=>date('Y-m-d H;i:s')
         ];
         ];