правки по запуску зарплатной ведомости

diff --git a/erp24/commands/AssignmentController.php b/erp24/commands/AssignmentController.php
index 26fd23122dafd95e4acb58a2f87baaff72c1e989..d743e27cb0cb58776d77e52a6f46f4de8a4ab46b 100644 (file)
--- a/erp24/commands/AssignmentController.php
+++ b/erp24/commands/AssignmentController.php
@@ -44,8 +44,8 @@ class AssignmentController extends Controller
 
                     if (!empty($uploadArrayInfo['start'])) {
                         $start = $uploadArrayInfo['start'];
-                        $startCheck = time() - 180;
-//                $startCheck = time() - 7200;
+//                        $startCheck = time() - 180;
+                        $startCheck = time() - 7200;
                         if ($start < $startCheck) {
                             echo time();
                             echo ' ';

diff --git a/erp24/controllers/ApiController.php b/erp24/controllers/ApiController.php
index 690428695a279190e5dd30d6f28e1f4a55e1bb47..fa9fac48cd0af0076f3d6c369750fec06fca7bd3 100644 (file)
--- a/erp24/controllers/ApiController.php
+++ b/erp24/controllers/ApiController.php
@@ -186,7 +186,10 @@ class ApiController extends Controller
         }
 
         $dataProvider = new ArrayDataProvider([
-            'allModels' => $entityArr
+            'allModels' => $entityArr,
+            'pagination' => [
+                'pageSize' => 2000,
+            ],
         ]);
 
         $columns = [