From f96442e164e9463ace620baef2c8d700810fd282 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 24 Jun 2026 14:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=84=8F=E8=AF=86=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=20=E6=8C=89=E9=83=A8=E9=97=A8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/SEController/1SESafeSurveyController.cs    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
index d1f20c5..86d8790 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
@@ -350,7 +350,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                     throw new Exception("试卷不能为空");
                 }
                 var safeID = entity.Nav_Papers[0].SAFE_ID;
-                var safe = GetEntity<T_SE_SAFE_SURVEY>(it => it.ID == safeID, new BaseFilter(null));
+                var safe = GetEntity<T_SE_SAFE_SURVEY>(it => it.ID == safeID, new BaseFilter(APT.Infrastructure.Api.AppContext.CurrentSession.OrgId));
                 if (safe == null)
                 {
                     throw new Exception("未查到有效数据");
@@ -416,7 +416,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 var dt = DateTime.Now;
                 var data = GetEntities<T_SE_SAFE_SURVEY>(
                     it => it.STATUS == SESafeSurveyStatus.完成 && it.TASK_ID != null && it.LAUNCH_TIME != null && it.LAUNCH_TIME.Value.Year == dt.Year,
-                    new BaseFilter(null)).Distinct(it => it.TASK_ID).ToList();
+                    new BaseFilter(filter.OrgId)).Distinct(it => it.TASK_ID).ToList();
                 if (data != null)
                 {
                     data.ForEach(it =>
@@ -481,7 +481,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 {
                     var tmp = GetEntity<T_SE_SAFE_SURVEY>(
                         t => t.ID == ret.SURVEY_ID.Value,
-                        new BaseFilter(null),
+                        new BaseFilter(filter.OrgId),
                         paths);
                     if (tmp != null)
                     {
@@ -498,7 +498,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 {
                     var tmp = GetEntities<T_SE_SAFE_SURVEY>(
                         t => t.TASK_ID != null && t.TASK_ID.Value == ret.TASK_ID.Value,
-                        new BaseFilter(null),
+                        new BaseFilter(filter.OrgId),
                         paths).ToList();
                     if (tmp != null && tmp.Count > 0)
                     {
@@ -594,8 +594,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 else if (ret.TYPE == "部门")
                 {
                     baseFilter.SelectField = new string[] { "ANSWER", "Nav_User.Nav_Department.NAME", "Nav_Department.NAME", "Nav_Test.Nav_Points.POINT_ID", "Nav_Test.ANSWER" };
-
-                    papers = GetEntities<T_SE_SAFE_SURVEY_LIST_PAPER>(t => surveyIds.Contains(t.SAFE_ID), baseFilter);
+                    baseFilter.Include.Add("Nav_Department");
+                    baseFilter.Include.Add("Nav_User.Nav_Department");
+                    papers = GetEntities<T_SE_SAFE_SURVEY_LIST_PAPER>(t => surveyIds.Contains(t.SAFE_ID) && t.DEPARTMENT_ID.HasValue && !t.Nav_Department.IS_DELETED, baseFilter);
+                    baseFilter.Include = new List<string>();
                     papers.ForEach(paper =>
                     {
                         int idx = 0;