AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS Update

Browse Source
This commit is contained in:
SchreiberM
2021-06-25 10:06:06 +02:00
parent e796ae91cb
commit 70329f2fea
14 changed files with 231 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/DD-Record-Organizer/frmConstructor_Main.vb
View File

@@ -2983,7 +2983,6 @@ Public Class frmConstructor_Main
For Each Column As DataColumn In DT.Columns
Dim index As Integer = DT.Columns.IndexOf(Column)
Dim RECORDID_Column As TileViewItemElement
Dim ImageColumn As TileViewItemElement
Dim HeadlineColumn As TileViewItemElement
Dim TextColumn As TileViewItemElement
@@ -3787,11 +3786,11 @@ Public Class frmConstructor_Main
If CURRENT_DOCSEARCH_SQL = "" Then
CURRENT_DOCSEARCH_SQL = String.Format("SELECT DISTINCT T.* " & vbNewLine &
"FROM " & vbNewLine &
"VWPMO_DOC_SEARCH T" & vbNewLine &
"WHERE T.DocID IN (select DISTINCT T.DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine &
"AND T.DocID IN (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {2} AND dwObjectID = T.DocID)", ENTITY_ID, USER_LANGUAGE, USERID_FK_INT_ECM)
CURRENT_DOCSEARCH_SQL = $"SELECT DISTINCT T.*
FROM
TBPMO_DOCRESULT_LIST T INNER JOIN TBPMO_DOC_RECORD_LINK T1 ON T.DocID = T1.DOC_ID
INNER JOIN TBPMO_RECORD T2 ON T1.RECORD_ID = T2.GUID
WHERE T2.FORM_ID = {ENTITY_ID} AND T2.DELETED = 0)"
Else
CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@ENTITY_ID", ENTITY_ID)
CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_LANGUAGE", USER_LANGUAGE)