Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

2021-08-11 15:04:46 +08:00
parent 201285215b ba6360d671
commit 18fd529d8e
30 changed files with 328 additions and 214 deletions
@@ -2438,7 +2438,7 @@ class executionModel extends model
        return $this->dao->select('account, role, hours')
            ->from(TABLE_TEAM)
            ->where('root')->eq($execution)
-            ->andWhere('type')->eq('execution')
+            ->andWhere('type')->in('project,execution')
            ->andWhere('account')->notIN($currentMembers)
            ->fetchAll('account');
    }