From e0581a708b0354e48c47e0a88b12cbf20977d772 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 20 Aug 2024 09:34:30 +0800
Subject: [PATCH] =?UTF-8?q?APP=E9=9A=90=E6=82=A3=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=97=AE=E9=A2=98=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/BSCheckContentsController.cs              | 4 ++--
 .../APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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<T_BS_CHECK_CONTENTS>(null, pageFilter, null);
+                    orderPageEntities = GetOrderPageEntities<T_BS_CHECK_CONTENTS>(e => e.CHECKCONTENT != null, pageFilter, null);
                 }
                 else
                 {
@@ -54,7 +54,7 @@ namespace APT.BS.WebApi.Controllers.Api
                     }
                     catch { }
 
-                    orderPageEntities = GetOrderPageEntities<T_BS_CHECK_CONTENTS>(e => listMineEnums.Contains(e.CHECKOBJECT), pageFilter, null);
+                    orderPageEntities = GetOrderPageEntities<T_BS_CHECK_CONTENTS>(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<T_BS_RISK_SUBMIT_CONTENT>(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<T_BS_RISK_SUBMIT_CONTENT>(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;
             });