From 7d7d1f3c87ed34f3cef9126c0526031c75858bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 14 Aug 2024 16:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BIStatiscialAnalysisController.cs            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
index 09d4812..d97338d 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -6143,10 +6143,10 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                 {
                     throw new Exception("请先选择时间开始时间和结束时间");
                 }
-                if (string.IsNullOrEmpty(pageFilter.Keyword))
-                {
-                    throw new Exception("部门未传入，请联系管理员");
-                }
+                //if (string.IsNullOrEmpty(pageFilter.Keyword))
+                //{
+                //    throw new Exception("部门未传入，请联系管理员");
+                //}
                 var newFilter = new BaseFilter(pageFilter.OrgId);
                 DateTime year = DateTime.Parse(pageFilter.Parameter1);
                 DateTime yearEnd = DateTime.Parse(pageFilter.Parameter2);
@@ -6156,7 +6156,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                 int dayDidd = span.Days + 1;
                 if (dayDidd >= 180)
                     throw new Exception("查询时间不能超过6个月!");
-                var departmentId = Guid.Parse(pageFilter.Keyword);
+                //var departmentId = Guid.Parse(pageFilter.Keyword);
                 List<T_BI_SYSTEM_RUN_SUMMARY> departSummary = new List<T_BI_SYSTEM_RUN_SUMMARY>();
                 var taskYear = this.GetEntities<T_BI_NOTIFICATION_TASK_NEW>(t =>!t.IS_DELETED && t.CREATE_DATE >= year && t.CREATE_DATE <= yearEnd, new BaseFilter(pageFilter.OrgId)).ToList();
                 newFilter.SelectField = new List<string> { "ID", "PARENT_ID", "NAME", "Nav_Parent", "DEPARTMENT_TYPE" };
@@ -6164,11 +6164,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                 //newFilter.SelectField = new List<string> { "ID", "DEPARTMENT_ID", "NAME" };
                 //var userInfos = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, newFilter).ToList();
                 //部门级
-                var departGroupYear = taskYear.Where(t => t.DEPT_DEPARTMENT_ID != null && t.DEPT_DEPARTMENT_ID == departmentId).ToList();
+                var departGroupYear = taskYear.Where(t => t.DEPT_DEPARTMENT_ID != null).ToList();
                 //车间级
-                var shopGroupYear = taskYear.Where(t => t.SHOP_DEPARTMENT_ID != null && t.DEPT_DEPARTMENT_ID == departmentId).ToList();
+                var shopGroupYear = taskYear.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList();
                 //班组级
-                var classGroupYear = taskYear.Where(t => t.CLASS_DEPARTMENT_ID != null && t.DEPT_DEPARTMENT_ID == departmentId).ToList();
+                var classGroupYear = taskYear.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList();
                 //分组
                 if (departGroupYear.Any())
                 {