wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

辨识岗位字段调整

Browse Source
This commit is contained in:
何美荣 2026-09-10 10:12:51 +08:00
parent 816f72e9fc
commit fa9108fc1c
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -170,7 +170,7 @@ namespace APT.SK.WebApi.Controllers.Api
var allUserIds = allDirectUserIds.Union(deptUserIds).Distinct().ToList(); var allUserIds = allDirectUserIds.Union(deptUserIds).Distinct().ToList();
Dictionary<Guid, string> userNameDict = new Dictionary<Guid, string>(); Dictionary<Guid, string> userNameDict = new Dictionary<Guid, string>();
if (allUserIds.Any()) if (allUserIds.Any())
userNameDict = this.GetEntities<T_FM_USER>(t => allUserIds.Contains(t.ID), new BaseFilter(entity.ORG_ID)).ToDictionary(t => t.ID, t => t.NAME); userNameDict = this.GetEntities<T_FM_USER>(t => allUserIds.Contains(t.ID)&& t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)).ToDictionary(t => t.ID, t => t.NAME);
//加载岗位名称 //加载岗位名称
Dictionary<Guid, string> postNameDict = new Dictionary<Guid, string>(); Dictionary<Guid, string> postNameDict = new Dictionary<Guid, string>();
if (allPostIds.Any()) if (allPostIds.Any())
@ -318,8 +318,9 @@ namespace APT.SK.WebApi.Controllers.Api
.Where(n => !string.IsNullOrEmpty(n)) .Where(n => !string.IsNullOrEmpty(n))
.Distinct() .Distinct()
.ToList(); .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++; j++;
} }
@ -513,7 +514,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var dn in dds) foreach (var dn in dds)
detail.IDENTIFY_DEPARTMENT = detail.IDENTIFY_DEPARTMENT + j + "、" + dn + "；"; 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) foreach (var un in uus)
detail.IDENTIFY_USER = detail.IDENTIFY_USER + j + "、" + un + "；"; detail.IDENTIFY_USER = detail.IDENTIFY_USER + j + "、" + un + "；";
//辨识岗位：取该层级管控部门对应的岗位（两表部门相同），去重逐个展示 //辨识岗位：取该层级管控部门对应的岗位（两表部门相同），去重逐个展示
@ -525,8 +526,9 @@ namespace APT.SK.WebApi.Controllers.Api
.Where(n => !string.IsNullOrEmpty(n)) .Where(n => !string.IsNullOrEmpty(n))
.Distinct() .Distinct()
.ToList(); .ToList();
foreach (var pn in pps) detail.IDENTIFY_POST = detail.IDENTIFY_POST + j + "、" + string.Join(",", pps) + "；";
detail.IDENTIFY_POST = detail.IDENTIFY_POST + j + "、" + pn + "；"; //foreach (var pn in pps)
// detail.IDENTIFY_POST = detail.IDENTIFY_POST + j + "、" + pn + "；";
j++; j++;
} }
} }

9
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -276,9 +276,9 @@ namespace APT.SK.WebApi.Controllers.Api
.Where(n => !string.IsNullOrEmpty(n)) .Where(n => !string.IsNullOrEmpty(n))
.Distinct() .Distinct()
.ToList(); .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++; j++;
@ -433,8 +433,9 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var dn in departs) foreach (var dn in departs)
d.IDENTIFY_DEPARTMENT = d.IDENTIFY_DEPARTMENT + j + "、" + dn + "；"; 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<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>()).Where(x => !x.IS_DELETED).Select(t => t.Nav_Post?.NAME).Where(n => !string.IsNullOrEmpty(n)).Distinct().ToList(); var posts = d.Nav_DetailPosts.Where(x => x.DEPARTMENT_TYPE == p).SelectMany(x => x.Nav_ResultPostDets ?? new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>()).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 + "、" + string.Join(",", posts) + "；";
d.IDENTIFY_POST = d.IDENTIFY_POST + j + "、" + pn + "；"; //foreach (var pn in posts)
// d.IDENTIFY_POST = d.IDENTIFY_POST + j + "、" + pn + "；";
j++; j++;
} }
} }