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

changes for mark

Browse Source
This commit is contained in:
Luca Haid
2025-04-10 13:12:20 +02:00
parent 4d8806c64a
commit df8f8fc71a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Building/BuildingModel.php
+2 -2
View File
@@ -290,7 +290,7 @@ class BuildingModel {
wv.value_text, wv.value_text,
(wv.create) AS created_at, (wv.create) AS created_at,
wv.create_by AS created_by_user_id, wv.create_by AS created_by_user_id,
(wv.edit) AS last_edited_at, wv.changed AS last_edited_at,
wv.edit_by AS last_edited_by_user_id wv.edit_by AS last_edited_by_user_id
FROM Workflowvalue wv FROM Workflowvalue wv
JOIN Workflowitem wi ON wv.item_id = wi.id JOIN Workflowitem wi ON wv.item_id = wi.id
@@ -298,7 +298,7 @@ JOIN Building b ON wv.object_id = b.id";
$where = ["wi.object_type = 'Building'", "wi.num < 150"]; $where = ["wi.object_type = 'Building'", "wi.num < 150"];
if ($from !== null && $to !== null) { if ($from !== null && $to !== null) {
$where[] = "((wv.create >= " . intval($from) . " AND wv.create <= " . intval($to) . ") OR (wv.edit >= " . intval($from) . " AND wv.edit <= " . intval($to) . "))"; $where[] = "(wv.changed >= " . intval($from) . " AND wv.changed <= " . intval($to) . ")";
} }
if ($network_id !== null) { if ($network_id !== null) {
$where[] = "b.network_id = " . intval($network_id); $where[] = "b.network_id = " . intval($network_id);