From 774b6fc01c8d4b7e6d8cb8af7ebeaecd3806092b Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 2 Jul 2024 13:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=8C=83=E5=9B=B4=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=A3=80=E6=9F=A5=E5=86=85=E5=AE=B9=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/BSCheckContentsController.cs   |  4 +++-
 .../Api/BSCheckProjectCategoryController.cs        | 14 ++++++++++++--
 .../Controllers/Api/BSPlanSetController.cs         | 12 ++++++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs
index 9b8f3ab..b7d56a0 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs
@@ -181,7 +181,8 @@ namespace APT.BS.WebApi.Controllers.Api
                 entity.Nav_ListCheckQuestion = null;
                 if (!string.IsNullOrEmpty(entity.StrCheckObject))
                 {
-                    List<string> list = entity.StrCheckObject.Split('_', StringSplitOptions.RemoveEmptyEntries).ToList();
+                    //List<string> list = entity.StrCheckObject.Split('_', StringSplitOptions.RemoveEmptyEntries).ToList();
+                    List<string> list = new List<string>() { ((int)BSMineTypeEnum.Mine).ToString() };
                     for (int i = 0; i < list.Count; i++)
                     {
                         try
@@ -208,6 +209,7 @@ namespace APT.BS.WebApi.Controllers.Api
                 }
                 else
                 {
+                    entity.CHECKOBJECT = BSMineTypeEnum.Mine;
                     this.UnifiedCommit(() =>
                     {
                         if (entity != null)
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckProjectCategoryController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckProjectCategoryController.cs
index 2e7a80d..2ba8f80 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckProjectCategoryController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckProjectCategoryController.cs
@@ -43,7 +43,17 @@ namespace APT.BS.WebApi.Controllers.Api
 
                 if (listObj == null)
                 {
-                    throw new Exception("请完善检查范围！");
+                    var checkCategory = GetEntity<T_BS_CHECK_PROJECT_CATEGORY_OBJECT>(e => e.CHECKOBJECT == BSMineTypeEnum.Mine && e.PROJECT_CATEGORY_ID == entity.ID);
+                    if (checkCategory == null)
+                    {
+                        listObj = new List<T_BS_CHECK_PROJECT_CATEGORY_OBJECT>();
+                        listObj.Add(new T_BS_CHECK_PROJECT_CATEGORY_OBJECT()
+                        {
+                            ORG_ID = entity.ORG_ID,
+                            CHECKOBJECT = BSMineTypeEnum.Mine,
+                            PROJECT_CATEGORY_ID = entity.ID,
+                        });
+                    }
                 }
                 var listCategoryType = entity.Nav_ListCategoryType;
                 entity.Nav_ListCategoryType = null;
@@ -62,7 +72,7 @@ namespace APT.BS.WebApi.Controllers.Api
                 {
                     if (entity != null)
                         UpdateEntityNoCommit(entity);
-                    if (listObj.Any())
+                    if (listObj != null && listObj.Any())
                         BantchSaveEntityNoCommit(listObj);
                     if (listCategoryType.Any())
                         BantchSaveEntityNoCommit(listCategoryType);
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSPlanSetController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSPlanSetController.cs
index ab5835f..c2d98ae 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSPlanSetController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSPlanSetController.cs
@@ -81,13 +81,17 @@ namespace APT.BS.WebApi.Controllers.Api
                 var ListSetDepObject = entity.Nav_ListSetDepObject;
                 entity.Nav_ListSetDepObject = null;
                 int rowIndex = 1;
-                foreach (var item in ListSetDepObject)
+                if (ListSetDepObject != null && ListSetDepObject.Any())
                 {
-                    if (!item.DEPARTMENT_ID.HasValue)
+                    foreach (var item in ListSetDepObject)
                     {
-                        throw new Exception("请设置部门，行：" + rowIndex + "！");
+                        item.CHECKOBJECT = BSMineTypeEnum.Mine;
+                        if (!item.DEPARTMENT_ID.HasValue)
+                        {
+                            throw new Exception("请设置部门，行：" + rowIndex + "！");
+                        }
+                        rowIndex++;
                     }
-                    rowIndex++;
                 }
                 this.UnifiedCommit(() =>
                 {