From fa9108fc1c1fea3c034e2ed50061d9fd37723b54 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: Thu, 10 Sep 2026 10:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=A8=E8=AF=86=E5=B2=97=E4=BD=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/RiskEvaluationController.cs | 14 ++++++++------ .../Api/RiskIdentifyResultController.cs | 9 +++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index 4184c2b..7469e61 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -170,7 +170,7 @@ namespace APT.SK.WebApi.Controllers.Api var allUserIds = allDirectUserIds.Union(deptUserIds).Distinct().ToList(); Dictionary userNameDict = new Dictionary(); if (allUserIds.Any()) - userNameDict = this.GetEntities(t => allUserIds.Contains(t.ID), new BaseFilter(entity.ORG_ID)).ToDictionary(t => t.ID, t => t.NAME); + userNameDict = this.GetEntities(t => allUserIds.Contains(t.ID)&& t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)).ToDictionary(t => t.ID, t => t.NAME); //加载岗位名称 Dictionary postNameDict = new Dictionary(); if (allPostIds.Any()) @@ -318,8 +318,9 @@ namespace APT.SK.WebApi.Controllers.Api .Where(n => !string.IsNullOrEmpty(n)) .Distinct() .ToList(); - foreach (var pn in postNames) - de.IDENTIFY_POST = de.IDENTIFY_POST + j + "、" + pn + "；"; + + //foreach (var pn in postNames) + de.IDENTIFY_POST = de.IDENTIFY_POST + j + "、" + string.Join(",", postNames) + "；"; } j++; } @@ -513,7 +514,7 @@ namespace APT.SK.WebApi.Controllers.Api foreach (var dn in dds) detail.IDENTIFY_DEPARTMENT = detail.IDENTIFY_DEPARTMENT + j + "、" + dn + "；"; //管控责任人：取管控部门负责人（去重，逐个展示） - var uus = detail.Nav_DetailDeparts.Where(x => x.DEPARTMENT_TYPE == p).Select(t => t.Nav_Department?.Nav_User?.NAME).Where(n => !string.IsNullOrEmpty(n)).Distinct().ToList(); + var uus = detail.Nav_DetailDeparts.Where(x => x.DEPARTMENT_TYPE == p && x.Nav_Department!=null && x.Nav_Department.Nav_User!=null && x.Nav_Department.Nav_User.ENABLE_STATUS == 0).Select(t => t.Nav_Department.Nav_User.NAME).Where(n => !string.IsNullOrEmpty(n)).Distinct().ToList(); foreach (var un in uus) detail.IDENTIFY_USER = detail.IDENTIFY_USER + j + "、" + un + "；"; //辨识岗位：取该层级管控部门对应的岗位（两表部门相同），去重逐个展示 @@ -525,8 +526,9 @@ namespace APT.SK.WebApi.Controllers.Api .Where(n => !string.IsNullOrEmpty(n)) .Distinct() .ToList(); - foreach (var pn in pps) - detail.IDENTIFY_POST = detail.IDENTIFY_POST + j + "、" + pn + "；"; + detail.IDENTIFY_POST = detail.IDENTIFY_POST + j + "、" + string.Join(",", pps) + "；"; + //foreach (var pn in pps) + // detail.IDENTIFY_POST = detail.IDENTIFY_POST + j + "、" + pn + "；"; j++; } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index d467cf7..1142065 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -276,9 +276,9 @@ namespace APT.SK.WebApi.Controllers.Api .Where(n => !string.IsNullOrEmpty(n)) .Distinct() .ToList(); - foreach (var pn in postNames) + //foreach (var pn in postNames) { - de.IDENTIFY_POST = de.IDENTIFY_POST + j + "、" + pn + "；"; + de.IDENTIFY_POST = de.IDENTIFY_POST + j + "、" + string.Join(",", postNames) + "；"; } } j++; @@ -433,8 +433,9 @@ namespace APT.SK.WebApi.Controllers.Api foreach (var dn in departs) d.IDENTIFY_DEPARTMENT = d.IDENTIFY_DEPARTMENT + j + "、" + dn + "；"; var posts = d.Nav_DetailPosts.Where(x => x.DEPARTMENT_TYPE == p).SelectMany(x => x.Nav_ResultPostDets ?? new List()).Where(x => !x.IS_DELETED).Select(t => t.Nav_Post?.NAME).Where(n => !string.IsNullOrEmpty(n)).Distinct().ToList(); - foreach (var pn in posts) - d.IDENTIFY_POST = d.IDENTIFY_POST + j + "、" + pn + "；"; + d.IDENTIFY_POST = d.IDENTIFY_POST + j + "、" + string.Join(",", posts) + "；"; + //foreach (var pn in posts) + // d.IDENTIFY_POST = d.IDENTIFY_POST + j + "、" + pn + "；"; j++; } }