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

2021-08-31 13:01:16 +08:00
parent 757d23337d 79f28e9605
commit 8a99c654f5
8 changed files with 71 additions and 55 deletions
@@ -2455,6 +2455,7 @@ class executionModel extends model
            ->andWhere('(project')->eq($projectID)
            ->orWhere('id')->eq($projectID)
            ->markRight(1)
+            ->orderBy('project_asc')
            ->fetchAll('id');

        if(empty($teams)) return array();