diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index c115016..457f656 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -1899,7 +1899,7 @@ namespace APT.BaseData.Services.DomainServices
                     });
                 }
 
-                var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.DISCLOSURE_PERSON_ID);
+                var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.APPLY_USER_ID);
                 //发消息
                 DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null);
                 notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表(外包)", tech.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now,
@@ -2213,15 +2213,15 @@ namespace APT.BaseData.Services.DomainServices
                     tech.IS_AUTO = (int)ISImportantEnum.是;
                     tech.IS_OUTSOURCE = true;
                     tech.RELATED_ID = entity.RELATED_ID;
-                    if (entity.MONITOR_USER_ID != null)
-                    {
-                        T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON();
-                        person.ORG_ID = entity.ORG_ID;
-                        person.USER_ID = entity.MONITOR_USER_ID;
-                        person.TECH_DISCLOSURE_FROM_ID = tech.ID;
-                        person.CREATER_ID = entity.CREATER_ID;
-                        techUsers.Add(person);
-                    }
+                    //if (entity.MONITOR_USER_ID != null)
+                    //{
+                    //    T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON();
+                    //    person.ORG_ID = entity.ORG_ID;
+                    //    person.USER_ID = entity.MONITOR_USER_ID;
+                    //    person.TECH_DISCLOSURE_FROM_ID = tech.ID;
+                    //    person.CREATER_ID = entity.CREATER_ID;
+                    //    techUsers.Add(person);
+                    //}
                     if (entity.Nav_CrucialLicensePerson != null && entity.Nav_CrucialLicensePerson.Any())
                     {
                         entity.Nav_CrucialLicensePerson.ForEach(t =>
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
index 2ac93ec..cc5d3ac 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
@@ -5613,7 +5613,6 @@ namespace APT.BS.WebApi.Controllers.Api
                 var files = entity.Nav_Files;
                 entity.Nav_Files = null;
                 //entity.RiskContentState  5 10   需要处理
-
                 #region    必填判断
 
                 if (entity.RiskContentState == 10)
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
index 48b2243..e12737e 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
@@ -1543,6 +1543,7 @@ namespace APT.FO.WebApi.Controllers
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
index 1ff4dbe..192e0e3 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
@@ -323,7 +323,7 @@ namespace APT.FO.WebApi.Controllers
                         var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
                         if (curentApprove != null)
                         {
-                            var removeApprove = appdetails.Where(i => i.NUM < curentApprove.NUM && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing);
+                            var removeApprove = appdetails.Where(i => i.NUM < curentApprove.NUM && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
                             if (removeApprove != null && removeApprove.Any())
                             {
                                 foreach (var item in removeApprove)
@@ -338,14 +338,14 @@ namespace APT.FO.WebApi.Controllers
                             appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
                             sendUserIds = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
                         }
-                        //else
-                        //{
-                        //    var appdetailsAll = appdetails;
-                        //    var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId);
-                        //    appdetailsAll.Remove(removeTemps);
-                        //    appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
-                        //    sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
-                        //}
+                        else
+                        {
+                            var appdetailsAll = appdetails;
+                            var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId);
+                            appdetailsAll.Remove(removeTemps);
+                            appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true);
+                            sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList();
+                        }
                         if (sendUserIds != null && sendUserIds.Any())
                         {
                             var sendUserNames = new List<string>();
@@ -637,6 +637,7 @@ namespace APT.FO.WebApi.Controllers
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs
index 864c1df..8c50d41 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs
@@ -535,6 +535,7 @@ namespace APT.HM.WebApi.Controllers.Api
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs
index 1d67f28..1d3fdc0 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs
@@ -830,6 +830,7 @@ namespace APT.HM.WebApi.Controllers.Api
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t=>t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs
index 956190c..4f23856 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs
@@ -663,6 +663,7 @@ namespace APT.HM.WebApi.Controllers.Api
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs
index 6b14696..32dd22c 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs
@@ -903,6 +903,7 @@ namespace APT.HM.WebApi.Controllers.Api
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs
index 6bdec6b..0ca0b67 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs
@@ -660,6 +660,7 @@ namespace APT.HM.WebApi.Controllers.Api
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
+            pageFilter.IgnoreDataRule = true;
             //安环部负责人departmentID
             var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
             if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)