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

2023-04-18 13:16:42 +08:00
parent 689b765faf 0d31625643
commit b8e8c3d788
21 changed files with 300 additions and 45 deletions
@@ -304,7 +304,7 @@ class projectModel extends model
            ->beginIF($queryType == 'bystatus' and $param != 'all' and $param != 'undone')->andWhere('status')->eq($param)->fi()
            ->beginIF($queryType == 'byid')->andWhere('id')->eq($param)->fi()
            ->orderBy($orderBy)
-            ->limit($limit)
+            ->beginIF($limit)->limit($limit)->fi()
            ->fetchAll('id');

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