作者 李宇航

合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3246
@@ -154,6 +154,7 @@ class FetchTicketProjects extends Command @@ -154,6 +154,7 @@ class FetchTicketProjects extends Command
154 'status' => $status, // 项目状态 154 'status' => $status, // 项目状态
155 'wechat_group_id' => $item['wx_id'], 155 'wechat_group_id' => $item['wx_id'],
156 'team' => $team_ids ? json_encode($team_ids) : null, 156 'team' => $team_ids ? json_encode($team_ids) : null,
  157 + 'flg_show'=>$item['flg_show'] ?? 1,
157 ]; 158 ];
158 if (!$project) { 159 if (!$project) {
159 $new = new TicketProject(); 160 $new = new TicketProject();
@@ -70,7 +70,7 @@ class InquiryController extends BaseController @@ -70,7 +70,7 @@ class InquiryController extends BaseController
70 * 新增表单提交返回跳转链接 70 * 新增表单提交返回跳转链接
71 */ 71 */
72 protected function inquiryResult(){ 72 protected function inquiryResult(){
73 - $domain = request()->getHost(); 73 + $domain = $this->param['globalso-domain'] ?? '';
74 $cache_key = 'inquiry_form_back_' . $domain; 74 $cache_key = 'inquiry_form_back_' . $domain;
75 $result = Cache::get($cache_key); 75 $result = Cache::get($cache_key);
76 if(!$result){ 76 if(!$result){