Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'RMLWorkorder/fix-get-company' into 'master'

Browse Source 
fixed get company orders

See merge request fronk/thetool!1651
This commit is contained in:
Luca Haid
2025-08-19 06:52:19 +00:00
parent 7b757c2cb5 e8cafc8f73
commit a2cc2d8a2e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/RMLWorkorder/RMLWorkorderModel.php
View File

@@ -215,7 +215,6 @@ class RMLWorkorderModel extends TTCrudBaseModel {
if ($limit !== null) {
$sql .= " LIMIT " . intval($limit) . " OFFSET " . intval($offset);
}
$result = $db->query($sql);
return $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
}
@@ -230,6 +229,7 @@ class RMLWorkorderModel extends TTCrudBaseModel {
SELECT COUNT(w.id) as count
FROM `$fronkDbName`.`RMLWorkorder` w
JOIN `$fronkDbName`.`Preorder` p ON w.preorderId = p.id
LEFT JOIN `$fronkDbName`.`RMLWorkorderCompany` c ON w.companyId = c.id
LEFT JOIN `$addressDbName`.`Hausnummer` hn ON p.adb_hausnummer_id = hn.id
LEFT JOIN `$addressDbName`.`Strasse` str ON hn.strasse_id = str.id
LEFT JOIN `$addressDbName`.`Plz` plz ON hn.plz_id = plz.id