diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs index b7d56a0..07fd4a3 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckContentsController.cs @@ -42,7 +42,7 @@ namespace APT.BS.WebApi.Controllers.Api if (listMineType == null || listMineType.Count < 1) { - orderPageEntities = GetOrderPageEntities(null, pageFilter, null); + orderPageEntities = GetOrderPageEntities(e => e.CHECKCONTENT != null, pageFilter, null); } else { @@ -54,7 +54,7 @@ namespace APT.BS.WebApi.Controllers.Api } catch { } - orderPageEntities = GetOrderPageEntities(e => listMineEnums.Contains(e.CHECKOBJECT), pageFilter, null); + orderPageEntities = GetOrderPageEntities(e => listMineEnums.Contains(e.CHECKOBJECT) && e.CHECKCONTENT != null, pageFilter, null); } //BSMineTypeEnum? CHECKOBJECT = null; diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index 3327a34..25cbdaf 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -499,7 +499,8 @@ namespace APT.BS.WebApi.Controllers.Api } else { - modelSub.Nav_ListRiskSubmitContent = GetEntities(e => e.RISK_SUBMIT_ID == guid, null, "Nav_CheckMain", "Nav_Files.Nav_ImgFile.Nav_File", "Nav_User", "Nav_UserDeal", "Nav_DepartmentDeal", "Nav_ListRiskQuestionReason.Nav_RiskReason").ToList(); + //APP查看 需要 Nav_RiskArea + modelSub.Nav_ListRiskSubmitContent = GetEntities(e => e.RISK_SUBMIT_ID == guid, null, "Nav_CheckMain", "Nav_RiskArea", "Nav_Files.Nav_ImgFile.Nav_File", "Nav_User", "Nav_UserDeal", "Nav_DepartmentDeal", "Nav_ListRiskQuestionReason.Nav_RiskReason").ToList(); } return modelSub; });