Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

This commit is contained in:
2026-03-30 16:53:43 +02:00

View File

@@ -36,7 +36,7 @@ Public Class cParameterList
Try
LIST.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN
Using cmd As New SqlCommand("SELECT * FROM [tblParameter] WHERE progId IN (0,@ProgId) " & If(firma IsNot Nothing, " AND firma=@firma", ""), conn)
Using cmd As New SqlCommand("SELECT * FROM [tblParameter] WHERE progId IN (0,@ProgId) " & If(firma IsNot Nothing, " AND (firma=@firma or firma is null)", ""), conn)
cmd.Parameters.AddWithValue("@ProgId", ProgId)
If firma IsNot Nothing Then cmd.Parameters.AddWithValue("@firma", firma)
' cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr)