diff --git a/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB.cs b/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB.cs
index c41e7e6..8aad372 100644
--- a/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB.cs
+++ b/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB.cs
@@ -13,7 +13,7 @@ using System.Text;
 namespace APT.MS.Domain.Entities.FO
 {
     [Description("关键许可工作表")]
-    [DataRuleField("DEPARTMENT_ID")]
+    [DataRuleField("Nav_ApplyUser.DEPARTMENT_ID")]
     public class T_FO_CRUCIAL_LICENSE_JOB : MesEntityBase
     {
         [Description("编号")]
diff --git a/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE.cs b/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE.cs
index 7cccf6f..9028e83 100644
--- a/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE.cs
+++ b/APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE.cs
@@ -13,7 +13,7 @@ using System.Text;
 namespace APT.MS.Domain.Entities.FO
 {
     [Description("关键许可工作表")]
-    [DataRuleField("DEPARTMENT_ID")]
+    [DataRuleField("Nav_ApplyUser.DEPARTMENT_ID")]
     public class T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE : MesEntityBase
     {
         [Description("编号")]
diff --git a/APT.MS.Domain/Entities/FO/T_FO_JOB_EVENT_RECORD.cs b/APT.MS.Domain/Entities/FO/T_FO_JOB_EVENT_RECORD.cs
index 97205e2..4fb8a2c 100644
--- a/APT.MS.Domain/Entities/FO/T_FO_JOB_EVENT_RECORD.cs
+++ b/APT.MS.Domain/Entities/FO/T_FO_JOB_EVENT_RECORD.cs
@@ -10,7 +10,7 @@ using System.Text;
 namespace APT.MS.Domain.Entities.FO
 {
     [Description("作业活动记录表")]
-    [DataRuleField("DEPARTMENT_ID")]
+    [DataRuleField("Nav_CreateUser.DEPARTMENT_ID")]
     public class T_FO_JOB_EVENT_RECORD : MesEntityBase
     {
         [Description("编号")]
diff --git a/APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM.cs b/APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM.cs
index fc6ab9c..1adb2f8 100644
--- a/APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM.cs
+++ b/APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM.cs
@@ -11,7 +11,7 @@ using System.Text;
 namespace APT.MS.Domain.Entities.FO
 {
     [Description("技术交底表")]
-    [DataRuleField("DEPARTMENT_ID")]
+    [DataRuleField("Nav_DisclosurePerson.DEPARTMENT_ID")]
     public class T_FO_TECH_DISCLOSURE_FROM : MesEntityBase
     {
         [Description("编号")]
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
index 7a77816..ef83d02 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
@@ -228,7 +228,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
-            pageFilter.IgnoreDataRule = true;
+            //pageFilter.IgnoreDataRule = true;
             pageFilter.Include.Add("Nav_PreUsers");
             pageFilter.Include.Add("Nav_AfterUsers");
             pageFilter.Include.Add("Nav_Team");
@@ -239,20 +239,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID), pageFilter);
-                }
-                else
-                    result.Data = null;
+            {
+                pageFilter.IgnoreDataRule = false;
             }
+            result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID), pageFilter);
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             if (result.Data.Any())
             {
                 foreach (var entity in result.Data)
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
index 1c90b4e..1098bd2 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
@@ -1763,20 +1763,25 @@ namespace APT.FO.WebApi.Controllers
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
+            {
+                pageFilter.IgnoreDataRule = false;
             }
+            result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             if (result.Data.Any())
             {
                 var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
index 8201adf..29fd3f9 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
@@ -1068,20 +1068,25 @@ namespace APT.FO.WebApi.Controllers
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
+            {
+                pageFilter.IgnoreDataRule = false;
             }
+            result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             if (result.Data.Any())
             {
                 var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
index 5b3898c..f58f288 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
@@ -615,7 +615,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
         [HttpPost, Route("OrderPaged")]
         public PagedActionResult<T_FO_CURRENT_CLASS_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
         {
-            pageFilter.IgnoreDataRule = true;
             pageFilter.Include.Add("Nav_Team");
             var result = new PagedActionResult<T_FO_CURRENT_CLASS_RECORD>();
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
@@ -626,20 +625,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
-            else
+            else 
             {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
-            }
+                pageFilter.IgnoreDataRule = false;
+            }
+            result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             return result;
         }
     }
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
index 560646d..1ad352f 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
@@ -797,20 +797,25 @@ namespace APT.FO.WebApi.Controllers
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
+            {
+                pageFilter.IgnoreDataRule = false;
             }
+            result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             if (result.Data.Any())
             {
                 var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
index 3927929..343fa07 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
@@ -755,7 +755,7 @@ namespace APT.FO.WebApi.Controllers
             pageFilter.Include.Add("Nav_JobEventPerson.Nav_User");
             pageFilter.SelectField.Add("Nav_JobEventPerson.USER_ID");
             pageFilter.SelectField.Add("Nav_JobEventPerson.Nav_User.NAME");
-            pageFilter.IgnoreDataRule = true;
+            //pageFilter.IgnoreDataRule = true;
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
             var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
             var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
@@ -764,20 +764,25 @@ namespace APT.FO.WebApi.Controllers
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
+            {
+                pageFilter.IgnoreDataRule = false;
             }
+            result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             if (result.Data.Any())
             {
                 var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
index 8314472..6d6139b 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
@@ -872,7 +872,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
         [HttpPost, Route("OrderPaged")]
         public PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
         {
-            pageFilter.IgnoreDataRule = true;
+            //pageFilter.IgnoreDataRule = true;
             pageFilter.Include.Add("Nav_Team");
             pageFilter.Include.Add("Nav_Users.Nav_User");
             var result = new PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD>();
@@ -889,21 +889,26 @@ namespace APT.FO.WebApi.Controllers.Api.FO
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
             {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID));
-                    result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
+                pageFilter.IgnoreDataRule = false;
             }
+            result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID));
+            //        result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             return result;
         }
     }
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
index 5e97a26..85a6a01 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
@@ -255,7 +255,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
         [HttpPost, Route("OrderPaged")]
         public PagedActionResult<T_FO_TEAM_ACTIVITY> OrderPaged([FromBody] KeywordPageFilter pageFilter)
         {
-            pageFilter.IgnoreDataRule = true;
+            
             pageFilter.Include.Add("Nav_Taem");
             var result = new PagedActionResult<T_FO_TEAM_ACTIVITY>();
             var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
@@ -265,21 +265,26 @@ namespace APT.FO.WebApi.Controllers.Api.FO
             var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
-            {
-                result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter);
-            }
-            else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(t => t.Nav_Taem != null && departmentIds.Contains((Guid)t.Nav_Taem.DEPARTMENT_ID), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
-            }
+            {
+                pageFilter.IgnoreDataRule = true;
+            }
+            else
+            {
+                pageFilter.IgnoreDataRule = false;
+            }
+            result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(t => t.Nav_Taem != null && departmentIds.Contains((Guid)t.Nav_Taem.DEPARTMENT_ID), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             return result;
         }
 
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
index 6170d86..a12fc25 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
@@ -416,6 +416,7 @@ namespace APT.FO.WebApi.Controllers
                             {
                                 record.CREATER_ID = tech.Nav_JobName.MONITOR_USER_ID;
                                 var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.Nav_JobName.MONITOR_USER_ID);
+                                record.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
                                 //发消息
                                 DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, tech.ORG_ID.Value, DateTime.Now, null, null);
                                 notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("关键/许可作业活动记录表单(" + tech?.Nav_JobName?.JOB_DATE.Value.ToShortDateString().Replace("/", "") + ")", record.ID, record.ORG_ID, userInfo.ID, userInfo.NAME, DateTime.Now,
@@ -652,6 +653,7 @@ namespace APT.FO.WebApi.Controllers
                             {
                                 record.CREATER_ID = tech.Nav_JobName.MONITOR_USER_ID;
                                 var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.Nav_JobName.MONITOR_USER_ID);
+                                record.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
                                 //发消息
                                 DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, orgId.Value, DateTime.Now, null, null);
                                 notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("作业活动记录表单(关键/许可作业)", record.ID, record.ORG_ID, userInfo.ID, userInfo.NAME, DateTime.Now,
@@ -723,6 +725,7 @@ namespace APT.FO.WebApi.Controllers
                             {
                                 record.CREATER_ID = tech.Nav_JobNameOut.MONITOR_USER_ID;
                                 var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.Nav_JobNameOut.MONITOR_USER_ID);
+                                record.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
                                 //发消息
                                 DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, orgId.Value, DateTime.Now, null, null);
                                 notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("作业活动记录表单外包(关键/许可作业)", record.ID, record.ORG_ID, userInfo.ID, userInfo.NAME, DateTime.Now,
@@ -792,20 +795,25 @@ namespace APT.FO.WebApi.Controllers
             var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
             if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
             {
-                result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter);
+                pageFilter.IgnoreDataRule = true;
             }
             else
-            {
-                List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
-                List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
-                DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
-                if (departmentIds != null && departmentIds.Any())
-                {
-                    result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(t => (t.Nav_DisclosurePerson != null && departmentIds.Contains(t.Nav_DisclosurePerson.DEPARTMENT_ID.Value)), pageFilter);//|| dataIds.Contains(t.ID)
-                }
-                else
-                    result.Data = null;
-            }
+            {
+                pageFilter.IgnoreDataRule = false;
+            }
+            result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter);
+            //else
+            //{
+            //    List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
+            //    List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
+            //    DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
+            //    if (departmentIds != null && departmentIds.Any())
+            //    {
+            //        result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(t => (t.Nav_DisclosurePerson != null && departmentIds.Contains(t.Nav_DisclosurePerson.DEPARTMENT_ID.Value)), pageFilter);//|| dataIds.Contains(t.ID)
+            //    }
+            //    else
+            //        result.Data = null;
+            //}
             return result;
         }
     }
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
index 6bbb468..a576eb0 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
@@ -136,6 +136,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         de.SCOREL_ID = item.SCOREL_ID;
                         de.SCOREE_ID = item.SCOREE_ID;
                         de.SCOREC_ID = item.SCOREC_ID;
+                        de.EVALUATE_SCORE = item.EVALUATE_SCORE;
                         if (item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null)
                         {
                             throw new Exception("第" + item.NUM + "行，LEC都不能为空");