Добавлен order для отделений

app/Models/Department.php

@@ -16,6 +16,7 @@ class Department extends Model
         'name_short',
         'rf_mis_department_id',
         'rf_department_type',
+        'order',
     ];
 
     public function metrikaDefault()

app/Services/StatisticsService.php

@@ -38,12 +38,18 @@ class StatisticsService
      */
     private function resolveUserDepartments(User $user)
     {
-        return Department::select('department_id', 'name_short', 'rf_department_type', 'user_name', 'order')
+        $departmentsTable = (new Department)->getTable();
+        $userDepartmentsTable = (new UserDepartment)->getTable();
+
+        return Department::select('department_id', 'name_short', 'rf_department_type', 'user_name')
             ->with('departmentType')
-            ->join((new UserDepartment)->getTable(), (new Department)->getTable().'.department_id', (new UserDepartment)->getTable().'.rf_department_id')
-            ->where((new UserDepartment)->getTable().'.rf_user_id', $user->id)
+            ->join($userDepartmentsTable, "{$departmentsTable}.department_id", "{$userDepartmentsTable}.rf_department_id")
+            ->where("{$userDepartmentsTable}.rf_user_id", $user->id)
             ->orderBy('rf_department_type')
-            ->orderBy((new UserDepartment)->getTable().'.order', 'asc')
+            // Персональный порядок пользователя приоритетнее общего порядка отделений;
+            // общий порядок — как запасной вариант (тай-брейк), если у пользователя порядок не задан.
+            ->orderBy("{$userDepartmentsTable}.order", 'asc')
+            ->orderBy("{$departmentsTable}.order", 'asc')
             ->get()
             ->groupBy('departmentType.name_full');
     }