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 list = entity.StrCheckObject.Split('_', StringSplitOptions.RemoveEmptyEntries).ToList(); + //List list = entity.StrCheckObject.Split('_', StringSplitOptions.RemoveEmptyEntries).ToList(); + List list = new List() { ((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(e => e.CHECKOBJECT == BSMineTypeEnum.Mine && e.PROJECT_CATEGORY_ID == entity.ID); + if (checkCategory == null) + { + listObj = new List(); + 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(() => {