From cf9d793fb21ca6670dd5ee2e1c9e40b3e94c693e 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: Fri, 26 Jun 2026 14:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=A5=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/BIController/BIStatiscialAnalysisController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 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 f717067..79df9a8 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -427,7 +427,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController switch (type) { case "0": - departs = departments.Where(t => t.DEPARTMENT_TYPE == 10 || t.DEPARTMENT_STATUS == 2).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList(); + departs = departments.Where(t => t.DEPARTMENT_TYPE == 10 || (t.DEPARTMENT_STATUS == 2 && t.DEPARTMENT_TYPE == 5)).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList(); break; case "1": departs = departments.Where(t => t.DEPARTMENT_TYPE == 15).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); @@ -436,7 +436,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController departs = departments.Where(t => t.DEPARTMENT_TYPE == 20).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); break; case "3": - departs = departments.Where(t => t.DEPARTMENT_TYPE == 5 && t.DEPARTMENT_STATUS != 2).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList(); + departs = departments.Where(t => t.DEPARTMENT_TYPE == 5).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList(); break; default: break;