合并单密码判断修复

PDF Office/ViewModels/Dialog/ToolsDialogs/MergeDialogViewModel.cs

@@ -508,7 +508,10 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
                     if(CurrentFilePath == doc.FilePath)
                     {
 
-                        if ((!(!doc.IsLocked&&(SecurityHelper.CheckHaveAllPermissions(doc)))) && (!(!string.IsNullOrEmpty(currentLoadedPassword) && doc.UnlockWithPassword(currentLoadedPassword) && doc.CheckOwnerPassword(currentLoadedPassword))))
+                        if ((!(!doc.IsLocked&&(SecurityHelper.CheckHaveAllPermissions(doc)))) && 
+                            (!(!string.IsNullOrEmpty(currentLoadedPassword) && 
+                            doc.UnlockWithPassword(currentLoadedPassword) && 
+                            (doc.CheckOwnerPassword(currentLoadedPassword)||SecurityHelper.CheckHaveAllPermissions(doc)))))
                         {
                             doc.Release();
                             continue;
@@ -522,9 +525,9 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
                             if (condition.Password != null)
                             {
                                 mergeObject.Password = condition.Password;
-                               if(doc.UnlockWithPassword(condition.Password))
+                               if(doc.UnlockWithPassword(condition.Password)&& doc.CheckOwnerPassword(condition.Password))
                                 {
-                                    doc.CheckOwnerPassword(condition.Password);
+                                    
                                 }
                             }
                         }

PDF Office/ViewModels/Dialog/ToolsDialogs/SaftyDialogs/CheckPasswordDialogViewModel.cs

@@ -132,7 +132,7 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs.SaftyDialogs
             }
             else
             {
-                if (tempDocument.UnlockWithPassword(Password) && tempDocument.CheckOwnerPassword(Password))
+                if (tempDocument.UnlockWithPassword(Password) && (tempDocument.CheckOwnerPassword(Password)||SecurityHelper.CheckHaveAllPermissions(tempDocument)))
                 {
                         var dialogResult = new DialogResult(ButtonResult.OK);
                         dialogResult.Parameters.Add(ParameterNames.Password, Password);