This commit is contained in:
何美荣 2026-06-03 11:08:54 +08:00
parent 53889ba0f0
commit ad44ab23a9

View File

@ -1115,24 +1115,25 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
//var bmDeparts = departMents.Where(t => t.DEPARTMENT_TYPE == 10).ToList();
//foreach (var bm in bmDeparts)
//{
// deppartList.Add(bm);
// var cjDepart = departMents.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList();
// if (cjDepart.Any())
// {
// foreach (var cj in cjDepart)
// {
// deppartList.Add(cj);
// var bzDepart = departMents.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList();
// if (bzDepart.Any())
// {
// deppartList.AddRange(bzDepart);
// }
// }
// }
//}
var departTempIds = deppartList.Select(t => t.ID).ToList();
var bmDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 10 && !departTempIds.Contains(t.ID)).ToList();
foreach (var bm in bmDeparts)
{
deppartList.Add(bm);
var cjDepart = departMentTemps.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList();
if (cjDepart.Any())
{
foreach (var cj in cjDepart)
{
deppartList.Add(cj);
var bzDepart = departMentTemps.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList();
if (bzDepart.Any())
{
deppartList.AddRange(bzDepart);
}
}
}
}
foreach (var set in setList)
{
T_SK_IDENTIFY_EVALUATION_PLAN plan = new T_SK_IDENTIFY_EVALUATION_PLAN();