Merge branch 'ztflow-hufangzhou-main#hufangzhou' of zentao/zentaopms (#187)

2024-06-13 08:02:39 +00:00
parent 67d7f1f194 ccf5e94331
commit 114fe445fa
2 changed files with 10 additions and 3 deletions
@@ -3736,6 +3736,8 @@ class executionModel extends model
            preg_match("/`assignedTo`\s+(([^']*) ('([^']*)'))/", $condition, $matches);
            $condition = preg_replace('/`(\w+)`/', 't1.`$1`', $condition);
            $condition = str_replace("t1.$matches[0]", "(t1.$matches[0] or (t1.mode = 'multi' and t2.`account` $matches[1] and t1.status != 'closed' and t2.status != 'done') )", $condition);
+
+            $this->session->set('taskQueryCondition', $condition, $this->app->tab);
        }

        $sql = $this->dao->select('t1.id')->from(TABLE_TASK)->alias('t1');