diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 9d1ef4c..bededf9 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -13539,7 +13539,7 @@ namespace APT.BaseData.Services.DomainServices
                                             depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
                                             depart.NUM = i;
                                             resultDetailPosts.Add(depart);
-                                            var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).ToList();
+                                            var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).Distinct().ToList();
                                             if (postIds.Any())
                                             {
                                                 foreach (var poId in postIds)
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
index eb8466b..0a13e54 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
@@ -1843,7 +1843,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                                                 depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
                                                                 depart.NUM = i;
                                                                 resultDetailPosts.Add(depart);
-                                                                var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m=>m.Nav_Person?.POST_ID).ToList();
+                                                                var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m=>m.Nav_Person?.POST_ID).Distinct().ToList();
                                                                 if (postIds.Any())
                                                                 {
                                                                     foreach (var poId in postIds)
@@ -2032,7 +2032,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                                                             depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
                                                                             depart.NUM = i;
                                                                             resultDetailPosts.Add(depart);
-                                                                            var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).ToList();
+                                                                            var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).Distinct().ToList();
                                                                             if (postIds.Any())
                                                                             {
                                                                                 foreach (var poId in postIds)
@@ -2258,7 +2258,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                                                             depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
                                                                             depart.NUM = i;
                                                                             resultDetailPosts.Add(depart);
-                                                                            var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).ToList();
+                                                                            var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).Distinct().ToList();
                                                                             if (postIds.Any())
                                                                             {
                                                                                 foreach (var poId in postIds)
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
index 18b3344..1c7d49a 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
@@ -94,22 +94,22 @@ namespace APT.SK.WebApi.Controllers.Api
                     hiddenIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>(t => contentIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     postIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>(t => contentIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     departIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>(t => postIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                    foreach (var item in details)
+                    foreach (var item in details.Where(t => !t.IS_DELETED))
                     {
                         if (item.Nav_DoubleDetailMeasures != null && item.Nav_DoubleDetailMeasures.Any())
                         {
-                            foreach (var item2 in item.Nav_DoubleDetailMeasures)
+                            foreach (var item2 in item.Nav_DoubleDetailMeasures.Where(t => !t.IS_DELETED))
                             {
                                 if (item2.Nav_DetailMeasureContents != null && item2.Nav_DetailMeasureContents.Any())
                                 {
-                                    foreach (var item3 in item2.Nav_DetailMeasureContents)
+                                    foreach (var item3 in item2.Nav_DetailMeasureContents.Where(t => !t.IS_DELETED))
                                     {
                                         item3.ORG_ID = entity.ORG_ID;
                                         item3.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_ID = item2.ID;
                                         contentList.Add(item3);
                                         if (item3.Nav_DetailMeasureContentHiddens != null && item3.Nav_DetailMeasureContentHiddens.Any())
                                         {
-                                            foreach (var item4 in item3.Nav_DetailMeasureContentHiddens)
+                                            foreach (var item4 in item3.Nav_DetailMeasureContentHiddens.Where(t => !t.IS_DELETED))
                                             {
                                                 item4.ORG_ID = entity.ORG_ID;
                                                 item4.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID = item3.ID;
@@ -118,7 +118,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                         }
                                         if (item3.Nav_DetailMeasureContentBasics != null && item3.Nav_DetailMeasureContentBasics.Any())
                                         {
-                                            foreach (var item4 in item3.Nav_DetailMeasureContentBasics)
+                                            foreach (var item4 in item3.Nav_DetailMeasureContentBasics.Where(t => !t.IS_DELETED))
                                             {
                                                 item4.ORG_ID = entity.ORG_ID;
                                                 item4.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID = item3.ID;
@@ -127,13 +127,13 @@ namespace APT.SK.WebApi.Controllers.Api
                                         }
                                         if (item3.Nav_DetailMeasureContentPosts != null && item3.Nav_DetailMeasureContentPosts.Any())
                                         {
-                                            foreach (var item4 in item3.Nav_DetailMeasureContentPosts)
+                                            foreach (var item4 in item3.Nav_DetailMeasureContentPosts.Where(t => !t.IS_DELETED))
                                             {
                                                 item4.ORG_ID = entity.ORG_ID;
                                                 item4.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID = item3.ID;
                                                 if (item4.Nav_DetailPosts != null && item4.Nav_DetailPosts.Any())
                                                 {
-                                                    foreach (var item5 in item4.Nav_DetailPosts)
+                                                    foreach (var item5 in item4.Nav_DetailPosts.Where(t => !t.IS_DELETED))
                                                     {
                                                         item5.ORG_ID = entity.ORG_ID;
                                                         item5.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST_ID = item4.ID;
@@ -159,7 +159,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         var departType = "";
                         if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
                         {
-                            foreach (var item2 in item.Nav_DetailPosts)
+                            foreach (var item2 in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
                             {
                                 item2.ORG_ID = entity.ORG_ID;
                                 item2.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = item.ID;
@@ -197,13 +197,13 @@ namespace APT.SK.WebApi.Controllers.Api
                         //}
                         if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
                         {
-                            foreach (var item2 in item.Nav_DetailDeparts)
+                            foreach (var item2 in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
                             {
                                 item2.ORG_ID = entity.ORG_ID;
                                 item2.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = item.ID;
                                 if (item2.Nav_DepartDetails != null && item2.Nav_DepartDetails.Any())
                                 {
-                                    foreach (var item3 in item2.Nav_DepartDetails)
+                                    foreach (var item3 in item2.Nav_DepartDetails.Where(t => !t.IS_DELETED))
                                     {
                                         item3.ORG_ID = entity.ORG_ID;
                                         item3.MECHANISM_DETAIL_DEPART_ID = item2.ID;
@@ -224,7 +224,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 if (files != null && files.Any())
                 {
                     fileIds = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_FILE>(t => t.DOUBLE_PREVENT_MECHANISM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.DOUBLE_PREVENT_MECHANISM_ID = entity.ID;
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
index 31d2fb2..9e3dcf9 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
@@ -685,7 +685,7 @@ namespace APT.SK.WebApi.Controllers.Api
             var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
             var lib = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0, pageFilter);
             var libDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId));
-            var libPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId));
+            var libPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
             //var result = this.GetOrderPageEntities<T_SK_ENTERPRISE_LIBRARY>(null, pageFilter);
             //var result = WitOrderPaged(null, pageFilter);
             if (lib != null && lib.Any())
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs
index c431349..2f1b5b7 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs
@@ -103,13 +103,13 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 deleteIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(t => t.IDENTIFY_EVALUATION_PLAN_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                 deleteUserIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(t => deleteIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                if (details != null && details.Where(t => !t.IS_DELETED).Any())
+                if (details != null && details.Any())
                 {
                     foreach (var item in details.Where(t => !t.IS_DELETED).ToList())
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
-                        if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Where(t => !t.IS_DELETED).Any())
+                        if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Any())
                         {
                             foreach (var item2 in item.Nav_DetailUsers.Where(t => !t.IS_DELETED).ToList())
                             {
@@ -124,7 +124,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (files != null && files.Any())
                 {
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
@@ -133,7 +133,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (requires != null && requires.Any())
                 {
-                    foreach (var item in requires)
+                    foreach (var item in requires.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
@@ -142,7 +142,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (evaluations != null && evaluations.Any())
                 {
-                    foreach (var item in evaluations)
+                    foreach (var item in evaluations.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
index dccfd64..f0338b5 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
@@ -128,7 +128,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (details != null && details.Any())
                 {
-                    foreach (var item in details)
+                    foreach (var item in details.Where(t => !t.IS_DELETED))
                     {
                         T_SK_RISK_EVALUATION_DETAIL de = new T_SK_RISK_EVALUATION_DETAIL();
                         de.ORG_ID = entity.ORG_ID;
@@ -157,7 +157,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         }
                         if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
                         {
-                            foreach (var mm in item.Nav_DetailMeasures)
+                            foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_EVALUATION_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_DETAIL_MEASURE();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -173,7 +173,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailMeasures = null;
                         if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailDeparts)
+                            foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_EVALUATION_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_DETAIL_DEPART();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -186,7 +186,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailDeparts = null;
                         if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailPosts)
+                            foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_EVALUATION_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_DETAIL_POST();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -195,7 +195,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                 postList.Add(item2);
                                 if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any())
                                 {
-                                    foreach (var nn in mm.Nav_PostDetails)
+                                    foreach (var nn in mm.Nav_PostDetails.Where(t => !t.IS_DELETED))
                                     {
                                         T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
                                         item3.ORG_ID = entity.ORG_ID;
@@ -239,7 +239,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (files != null && files.Any())
                 {
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_EVALUATION_ID = entity.ID;
@@ -248,7 +248,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (requires != null && requires.Any())
                 {
-                    foreach (var item in requires)
+                    foreach (var item in requires.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_EVALUATION_ID = entity.ID;
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
index 6b23d72..8089f8a 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
@@ -70,7 +70,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deletePostDetailIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(t => deletePostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                    foreach (var item in details)
+                    foreach (var item in details.Where(t => !t.IS_DELETED))
                     {
                         T_SK_RISK_EVALUATION_SUMMARY_DETAIL de = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
                         de.ORG_ID = entity.ORG_ID;
@@ -95,7 +95,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         de.IDENTIFY_USER = item.IDENTIFY_USER;
                         if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
                         {
-                            foreach (var mm in item.Nav_DetailMeasures)
+                            foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -111,7 +111,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailMeasures = null;
                         if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailDeparts)
+                            foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -124,7 +124,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailDeparts = null;
                         if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailPosts)
+                            foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -133,7 +133,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                 postList.Add(item2);
                                 if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any())
                                 {
-                                    foreach (var nn in mm.Nav_PostDetails)
+                                    foreach (var nn in mm.Nav_PostDetails.Where(t => !t.IS_DELETED))
                                     {
                                         T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL();
                                         item3.ORG_ID = entity.ORG_ID;
@@ -149,7 +149,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (files != null && files.Any())
                 {
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_EVALUATION_SUMMARY_ID = entity.ID;
@@ -158,7 +158,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (requires != null && requires.Any())
                 {
-                    foreach (var item in requires)
+                    foreach (var item in requires.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_EVALUATION_SUMMARY_ID = entity.ID;
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
index 3032d31..951af43 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
@@ -93,7 +93,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (details != null && details.Any())
                 {
-                    foreach (var item in details)
+                    foreach (var item in details.Where(t => !t.IS_DELETED))
                     {
                         T_SK_RISK_IDENTIFY_DETAIL de = new T_SK_RISK_IDENTIFY_DETAIL();
                         de.ORG_ID = entity.ORG_ID;
@@ -107,10 +107,10 @@ namespace APT.SK.WebApi.Controllers.Api
                         de.MARK = item.MARK;
                         de.EMERGENCY = item.EMERGENCY;
                         de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
-                        de.MEASURE = item.MEASURE;
+                        //de.MEASURE = item.MEASURE;
                         if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
                         {
-                            foreach (var mm in item.Nav_DetailMeasures)
+                            foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_DETAIL_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -128,7 +128,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (files != null && files.Any())
                 {
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_IDENTIFY_ID = entity.ID;
@@ -137,7 +137,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (requires != null && requires.Any())
                 {
-                    foreach (var item in requires)
+                    foreach (var item in requires.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_IDENTIFY_ID = entity.ID;
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
index 04be7b5..1b7e3cc 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
@@ -128,7 +128,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (details != null && details.Any())
                 {
-                    foreach (var item in details)
+                    foreach (var item in details.Where(t => !t.IS_DELETED))
                     {
                         T_SK_RISK_IDENTIFY_RESULT_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
                         de.ORG_ID = entity.ORG_ID;
@@ -142,13 +142,13 @@ namespace APT.SK.WebApi.Controllers.Api
                         de.MARK = item.MARK;
                         de.EMERGENCY = item.EMERGENCY;
                         de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
-                        de.MEASURE = item.MEASURE;
+                        //de.MEASURE = item.MEASURE;
                         de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE;
                         de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT;
                         de.IDENTIFY_POST = item.IDENTIFY_POST;
                         if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
                         {
-                            foreach (var mm in item.Nav_DetailMeasures)
+                            foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -164,7 +164,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailMeasures = null;
                         if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailDeparts)
+                            foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -177,7 +177,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailDeparts = null;
                         if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailPosts)
+                            foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -187,7 +187,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                 postList.Add(item2);
                                 if (mm.Nav_ResultPostDets != null && mm.Nav_ResultPostDets.Any())
                                 {
-                                    foreach (var nn in mm.Nav_ResultPostDets)
+                                    foreach (var nn in mm.Nav_ResultPostDets.Where(t => !t.IS_DELETED))
                                     {
                                         T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL();
                                         item3.ORG_ID = entity.ORG_ID;
@@ -199,12 +199,11 @@ namespace APT.SK.WebApi.Controllers.Api
                             }
                         }
                         item.Nav_DetailPosts = null;
-                        detailList.Add(de);
                     }
                 }
                 if (files != null && files.Any())
                 {
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_IDENTIFY_RESULT_ID = entity.ID;
@@ -213,7 +212,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (requires != null && requires.Any())
                 {
-                    foreach (var item in requires)
+                    foreach (var item in requires.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.RISK_IDENTIFY_RESULT_ID = entity.ID;
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
index 5ea06b0..16c00af 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
@@ -71,7 +71,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     deleteDepartIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deletePostIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deletePostDetailIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(t => deletePostIds.Contains(t.IDENTIFY_RESULT_SUMMARY_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                    foreach (var item in details)
+                    foreach (var item in details.Where(t => !t.IS_DELETED))
                     {
                         T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
                         de.ORG_ID = entity.ORG_ID;
@@ -91,7 +91,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         de.IDENTIFY_POST = item.IDENTIFY_POST;
                         if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
                         {
-                            foreach (var mm in item.Nav_DetailMeasures)
+                            foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -107,7 +107,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailMeasures = null;
                         if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailDeparts)
+                            foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -120,7 +120,7 @@ namespace APT.SK.WebApi.Controllers.Api
                         item.Nav_DetailDeparts = null;
                         if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
                         {
-                            foreach (var mm in item.Nav_DetailPosts)
+                            foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
                             {
                                 T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST();
                                 item2.ORG_ID = entity.ORG_ID;
@@ -130,7 +130,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                 postList.Add(item2);
                                 if (mm.Nav_SumPostDets != null && mm.Nav_SumPostDets.Any())
                                 {
-                                    foreach (var nn in mm.Nav_SumPostDets)
+                                    foreach (var nn in mm.Nav_SumPostDets.Where(t => !t.IS_DELETED))
                                     {
                                         T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL();
                                         item3.ORG_ID = entity.ORG_ID;
@@ -146,7 +146,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (files != null && files.Any())
                 {
-                    foreach (var item in files)
+                    foreach (var item in files.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.IDENTIFY_RESULT_SUMMARY = entity.ID;
@@ -155,7 +155,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 }
                 if (requires != null && requires.Any())
                 {
-                    foreach (var item in requires)
+                    foreach (var item in requires.Where(t => !t.IS_DELETED))
                     {
                         item.ORG_ID = entity.ORG_ID;
                         item.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;