From ebf43c0366c514bd002b2165e396f0328ca496c0 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 27 Nov 2023 09:30:49 +0100 Subject: [PATCH] =?UTF-8?q?Essensbestellungen=20->=20Verag360=20f=C3=BCr?= =?UTF-8?q?=20kan=20nf=C3=BCr=20GF=20Bestellungen=20einsehen!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/frmEssensbestellungenAdministration.vb | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 21b454f8..979f09a7 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/frmEssensbestellungenAdministration.vb b/SDL/frmEssensbestellungenAdministration.vb index b6e0259b..a94f2908 100644 --- a/SDL/frmEssensbestellungenAdministration.vb +++ b/SDL/frmEssensbestellungenAdministration.vb @@ -130,7 +130,14 @@ Public Class frmEssensbestellungenAdministration Dim SQLwhere = "" If cboGebaeude._value IsNot "" Then SQLwhere &= " AND [eb_gebaeude] = '" & cboGebaeude._value.ToString & "'" - If cboAbteilung._value IsNot "" Then SQLwhere &= " AND [eb_abteilung] = '" & cboAbteilung._value.ToString & "'" + If cboAbteilung._value IsNot "" Then + SQLwhere &= " AND ([eb_abteilung] = '" & cboAbteilung._value.ToString & "'" + If cboAbteilung._value = "MDM" Then + SQLwhere &= " Or [eb_abteilung] = 'GF')" + Else + SQLwhere &= ")" + End If + End If If txtMitarbeiter.Text <> "" Then SQLwhere &= " AND [eb_mitname] like '%" & txtMitarbeiter.Text & "%'" If cbxAlleAnzeigen.Checked = False Then