mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Merge branch 'feature-6656/Worker_queue' of https://github.com/FH-Complete/FHC-Core into feature-6656/Worker_queue
This commit is contained in:
@@ -24,7 +24,8 @@ class Benutzerfunktion_model extends DB_Model
|
||||
{
|
||||
$params = array($uid);
|
||||
|
||||
$qry = "SELECT tbl_benutzerfunktion.*, tbl_organisationseinheit.organisationseinheittyp_kurzbz
|
||||
$qry = "SELECT tbl_benutzerfunktion.*, tbl_organisationseinheit.bezeichnung as organisationseinheit_bezeichnung,
|
||||
tbl_organisationseinheit.organisationseinheittyp_kurzbz
|
||||
FROM public.tbl_benutzerfunktion
|
||||
LEFT JOIN public.tbl_organisationseinheit USING(oe_kurzbz)
|
||||
WHERE uid=?";
|
||||
@@ -44,7 +45,7 @@ class Benutzerfunktion_model extends DB_Model
|
||||
$params[] = $endeZeitraum;
|
||||
}
|
||||
|
||||
$qry .= ";";
|
||||
$qry .= "ORDER BY datum_bis NULLS LAST, datum_von NULLS LAST;";
|
||||
|
||||
return $this->execQuery($qry, $params);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user