Skip to content
This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Commit 859c5d4

Browse files
authored
Finish hotfix/OS-77_main
OS-77 hotfix
2 parents f802b16 + 06ee38f commit 859c5d4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

IMIS_DAL/FamilyDAL.vb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,9 @@ Public Class FamilyDAL
394394
Dim data As New ExactSQL
395395
Dim sSQL As String = ""
396396
Dim dt As New DataTable
397-
sSQL = "Select * FROM tblInsuree WHERE CHFID = '" & CHFID & "' AND ValidityTo IS NULL"
397+
sSQL = "Select * FROM tblInsuree WHERE CHFID = @chfid AND ValidityTo IS NULL"
398398
data.setSQLCommand(sSQL, CommandType.Text)
399+
data.params("@chfid", SqlDbType.NVarChar, 12, CHFID)
399400
Return data.Filldata
400401
End Function
401402
Public Function CheckCanBeDeleted(ByVal FamilyID As Integer) As DataTable

IMIS_DAL/RoleDAL.vb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Public Class RoleDAL
3939
sSQL += "SET @IsDefaultLanguage = 0"
4040
sSQL += "SELECT [RoleID],[RoleUUID],CASE WHEN @IsDefaultLanguage = 1 THEN [RoleName] ELSE ISNULL(NULLIF(AltLanguage, ''),RoleName) END RoleName, CASE WHEN [IsSystem] > 0 THEN 'True' Else 'False' END System,isSystem,ISNULL(AltLanguage,RoleName) AltLanguage,"
4141
sSQL += " CASE WHEN [IsBlocked] = 1 THEN 'True' ELSE 'False' END Blocked,[ValidityFrom],[ValidityTo],[AuditUserID],[LegacyID] FROM tblRole"
42-
sSQL += " WHERE (Rolename like '" & erole.RoleName & "%' OR AltLanguage LIKE '" & erole.AltLanguage & "%') AND (isBlocked = @isBlocked OR @isBlocked IS NULL)"
42+
sSQL += " WHERE (Rolename like @RoleName OR AltLanguage LIKE @AltLanguage) AND (isBlocked = @isBlocked OR @isBlocked IS NULL)"
4343
If erole.IsSystem IsNot Nothing Then
4444
If erole.IsSystem = 1 Then
4545
sSQL += " AND isSystem > 0"
@@ -54,7 +54,8 @@ Public Class RoleDAL
5454
End If
5555

5656
data.setSQLCommand(sSQL, CommandType.Text)
57-
'data.params("@RoleName", SqlDbType.NVarChar, 50, erole.RoleName)
57+
data.params("@RoleName", SqlDbType.NVarChar, 50, $"%{erole.RoleName}%")
58+
data.params("@AltLanguage", SqlDbType.NVarChar, 50, $"%{erole.AltLanguage}%")
5859
data.params("@IsSystem", SqlDbType.Bit, erole.IsSystem)
5960
data.params("@IsBlocked", SqlDbType.Bit, erole.IsBlocked)
6061
data.params("@UserId", SqlDbType.Int, userId)

IMIS_DAL/UsersDAL.vb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,13 @@ AND (isSystem <> 0 AND isSystem NOT IN (1,2,4,256, 128,16,32,64,512,524288))) )"
206206
Public Function IsUserExists(ByVal UserID As Integer) As Boolean
207207
Dim sSQL As String = String.Empty
208208
Dim data As New ExactSQL
209-
Dim strSQL As String = "Select Top 1 * from tblUsers where tblUsers.UserId = @UserId AND tblUsers.UserId = @UserId AND isAssociated = 1 AND ValidityTo is null" 'LoginName = @LoginName and
209+
Dim strSQL As String = "Select Top 1 * from tblUsers where tblUsers.UserId = @UserId AND tblUsers.UserId = @UserId AND isAssociated = 1 AND ValidityTo is null"
210210

211211
If Not UserID = 0 Then
212212
strSQL += " AND tblUsers.UserId = @UserId"
213213
End If
214214

215215
data.setSQLCommand(strSQL, CommandType.Text)
216-
'data.params("@LoginName", SqlDbType.NVarChar, 25, eUserID)
217216
If Not UserID = 0 Then
218217
data.params("@UserId", SqlDbType.Int, UserID)
219218
End If

0 commit comments

Comments
 (0)