From ad44ab23a9b96e6803fceabe3078559f9a629188 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, 3 Jun 2026 11:08:54 +0800
Subject: [PATCH] 1

---
 .../Controllers/Api/SKController.cs           | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
index de96c45..7e5db2b 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
@@ -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();