From 342ac6f6bfb3a1dd2f8a72919b14997efa2fe641 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Fri, 8 Mar 2024 11:33:01 +0800 Subject: [PATCH] * Merge 18.x #67896fb06c16df01236db552593614c19467ed2a. --- module/execution/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/execution/model.php b/module/execution/model.php index 132c98a1ed..6f18725f0e 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1281,7 +1281,8 @@ class executionModel extends model /* Order by status's content whether or not done. */ $executions = $this->dao->select("*, IF(INSTR('done,closed', status) < 2, 0, 1) AS isDone, INSTR('doing,wait,suspended,closed', status) AS sortStatus")->from(TABLE_EXECUTION) - ->where('vision')->eq($this->config->vision) + ->where('type')->ne('') + ->beginIF($this->config->vision == 'lite')->andWhere('vision')->eq($this->config->vision)->fi() ->beginIF((!$this->session->multiple && $this->app->tab == 'execution') || strpos($mode, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi() ->beginIF($type != 'all')->andWhere('type')->in($type)->fi() ->beginIF($type == 'all')->andWhere('type')->in('stage,sprint,kanban')->fi()