From 93230113a295af25eaa81d005efdb2372e3a72db Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 20 Nov 2025 10:43:13 +0800
Subject: [PATCH 1/3] DEPARTMENT_TYPE

---
 .../Services/FM/FMFlowPermitService.cs         |  6 +++---
 .../Services/PF/PFApproveCallBackService.cs    |  4 ++--
 .../Controllers/Api/FMController.cs            | 18 +++++++++---------
 .../Controllers/Api/PRController.cs            |  2 +-
 .../Api/BIController/BIHomeController.cs       |  8 ++++----
 .../BIStatiscialAnalysisController.cs          |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
index 325ad84..6eb4400 100644
--- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
+++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
@@ -1776,7 +1776,7 @@ namespace APT.BaseData.Services.Services.FM
                                             else
                                             {
                                                 var dep = GetEntity<T_FM_DEPARTMENT>(item);
-                                                if (dep != null && depDEPARTMENT_TYPE == 15) 
+                                                if (dep != null && dep.DEPARTMENT_TYPE == 15) 
                                                 {
                                                     if (dep.USER_ID.HasValue)
                                                     { approveId = dep.USER_ID.Value; }
@@ -1807,7 +1807,7 @@ namespace APT.BaseData.Services.Services.FM
                                         else
                                         {
                                             var dep = GetEntity<T_FM_DEPARTMENT>(item);
-                                            if (dep != null && depDEPARTMENT_TYPE == 15) 
+                                            if (dep != null && dep.DEPARTMENT_TYPE == 15) 
                                             {
                                                 if (dep.USER_ID.HasValue)
                                                 { approveId = dep.USER_ID.Value; }
@@ -1833,7 +1833,7 @@ namespace APT.BaseData.Services.Services.FM
                                     else
                                     {
                                         var dep = GetEntity<T_FM_DEPARTMENT>(item);
-                                        if (dep != null && depDEPARTMENT_TYPE == 15) 
+                                        if (dep != null && dep.DEPARTMENT_TYPE == 15) 
                                         {
                                             if (dep.USER_ID.HasValue)
                                             { approveId = dep.USER_ID.Value; }
diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index d15d2ae..1fb7c5c 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -15857,7 +15857,7 @@ namespace APT.BaseData.Services.DomainServices
                                             }
                                             else
                                             {
-                                                if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_TYPE == 15) 
+                                                if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15) 
                                                 {
                                                     var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
                                                     if (dep != null)
@@ -15883,7 +15883,7 @@ namespace APT.BaseData.Services.DomainServices
                                     }
                                     else
                                     {
-                                        if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_TYPE == 15) 
+                                        if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15) 
                                         {
                                             var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
                                             if (dep != null)
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
index 234e792..e25f16e 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
@@ -303,7 +303,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                     completion.DEPARTMENT_ID = item.Key.TEAM_ID;
                                     completion.DEPARTMENT_NAME = item.Key.TeamName;
                                 }
-                                if (departInfoDEPARTMENT_TYPE == 15) 
+                                if (departInfo.DEPARTMENT_TYPE == 15) 
                                 {
                                     completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
                                     completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@@ -363,7 +363,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                     completion.DEPARTMENT_ID = item.Key.CLASS_TEAM_ID;
                                     completion.DEPARTMENT_NAME = item.Key.TeamName;
                                 }
-                                if (departInfoDEPARTMENT_TYPE == 15) 
+                                if (departInfo.DEPARTMENT_TYPE == 15) 
                                 {
                                     completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
                                     completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@@ -423,7 +423,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                     completion.DEPARTMENT_ID = item.Key.TEAM_ID;
                                     completion.DEPARTMENT_NAME = item.Key.TeamName;
                                 }
-                                if (departInfoDEPARTMENT_TYPE == 15) 
+                                if (departInfo.DEPARTMENT_TYPE == 15) 
                                 {
                                     completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
                                     completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@@ -937,7 +937,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                     completion.DEPARTMENT_ID = item.departmetId;
                                     completion.DEPARTMENT_NAME = departInfo?.NAME;
                                 }
-                                if (departInfoDEPARTMENT_TYPE == 15) 
+                                if (departInfo.DEPARTMENT_TYPE == 15) 
                                 {
                                     completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
                                     completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@@ -1257,7 +1257,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                     completion.DEPARTMENT_ID = item.departmentId;
                                     completion.DEPARTMENT_NAME = departInfo?.NAME;
                                 }
-                                if (departInfoDEPARTMENT_TYPE == 15) 
+                                if (departInfo.DEPARTMENT_TYPE == 15) 
                                 {
                                     completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
                                     completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@@ -1310,7 +1310,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                     completion.DEPARTMENT_ID = item.departmentId;
                                     completion.DEPARTMENT_NAME = departInfo?.NAME;
                                 }
-                                if (departInfoDEPARTMENT_TYPE == 15) 
+                                if (departInfo.DEPARTMENT_TYPE == 15) 
                                 {
                                     completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
                                     completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@@ -1608,7 +1608,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
 
                     //车间
                     depNum = 0;
-                    var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
+                    var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
                     foreach (var itemD in depC)
                     {
                         depNum++;
@@ -1928,7 +1928,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
 
                     //车间
                     depNum = 0;
-                    var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
+                    var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
                     foreach (var itemD in depC)
                     {
                         depNum++;
@@ -2485,7 +2485,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     //车间
                     depNum = 0;
                     NUMS = 0;
-                    var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
+                    var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
                     foreach (var itemD in depC)
                     {
                         depNum++;
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs
index 0c7c9d4..a267c8f 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs
@@ -860,7 +860,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                             var classDepartIds = departInfos.Where(t => t.PARENT_ID != null && shopDepartIds.Contains((Guid)t.PARENT_ID)).Select(m => m.ID).ToList();
                                             alldepartIds.AddRange(classDepartIds);
                                         }
-                                        if (item != null && item.Nav_Department != null && item.Nav_DepartmentDEPARTMENT_TYPE == 15) 
+                                        if (item != null && item.Nav_Department != null && item.Nav_Department.DEPARTMENT_TYPE == 15) 
                                         {
                                             alldepartIds.Add((Guid)item.DEPARTMENT_ID);
                                             var classDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList();
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
index 80ec57d..4ba9649 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
@@ -1317,13 +1317,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                 {
                     return result;
                 }
-                List<Guid> listDepIDCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量
+                List<Guid> listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量
 
                 DateTime dtNow = DateTime.Now;
                 List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
                 List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
 
-                listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
+                listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
                 listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();
                 T_FM_ENUMS enums = null;
 
@@ -1344,7 +1344,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                         listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null);
                         if (listDep1MineType != null && listDep1MineType.Any())
                         {
-                            listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .ToList();
+                            listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .ToList();
                             listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList();
                         }
                     }
@@ -1566,7 +1566,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                 List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
                 List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
 
-                listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
+                listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
                 listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();
 
 
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 ffcb5e4..3bfa8eb 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -422,7 +422,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                             case "1":
                                 tasks = tasks.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList();
                                 tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.SHOP_DEPARTMENT_ID)?.NAME; });
-                                departs = departments.Where(t => tDEPARTMENT_TYPE == 15) .OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList();
+                                departs = departments.Where(t => t.DEPARTMENT_TYPE == 15) .OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList();
                                 break;
                             case "2":
                                 tasks = tasks.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList();
@@ -10673,7 +10673,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                         {
                             express = express.And(t => t.DEPT_DEPARTMENT_ID == departInfo.ID);
                         }
-                        else if (departInfoDEPARTMENT_TYPE == 15) 
+                        else if (departInfo.DEPARTMENT_TYPE == 15) 
                         {
                             express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID);
                         }

From 60eab2f3cf74923da53be5b00ed0c52f5890c9d5 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 20 Nov 2025 12:14:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E6=95=99=E8=82=B2=20FMDepartmentType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/FM/FMFlowPermitService.cs           |  8 ++++----
 .../Services/PF/PFApproveCallBackService.cs      |  8 ++++----
 .../Controllers/Api/BSRiskSubmitController.cs    |  6 +++---
 .../Controllers/FMUserController.cs              |  2 +-
 .../Controllers/Api/SCController.cs              |  8 ++++----
 .../Controllers/Api/SKController.cs              |  8 ++++----
 .../BIStatiscialAnalysisController.cs            |  8 ++++----
 .../Api/MTController/SCMTMeetingController.cs    | 16 ++++++++--------
 .../Api/SCController/StandardCreateController.cs |  8 ++++----
 .../Controllers/Api/SEController/SENewUsers.cs   | 11 ++++++-----
 10 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
index 6eb4400..ee9301a 100644
--- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
+++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
@@ -1276,18 +1276,18 @@ namespace APT.BaseData.Services.Services.FM
                                     //生产部门
                                     switch (depTemp.DEPARTMENT_TYPE)
                                     {
-                                        case 0:
+                                        case 10:
                                             approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("部门"));
                                             break;
-                                        case 1:
+                                        case 15:
                                             //车间级
                                             approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("车间"));
                                             break;
-                                        case 2:
+                                        case 20:
                                             //班组级 班长
                                             //detail.APPROVE_USER_ID = depTemp.USER_ID;
                                             break;
-                                        case 3:
+                                        case 5:
                                             approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("公司"));
                                             break;
                                         default:
diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 1fb7c5c..f1ecf17 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -12922,7 +12922,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 200)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                         departIds.Add((Guid)parentId);
@@ -13321,7 +13321,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 200)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                         if (parentId != null)
@@ -13819,7 +13819,7 @@ namespace APT.BaseData.Services.DomainServices
                         var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
                         departIds.AddRange(classIds);
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 200)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                         if (parentId != null)
@@ -14256,7 +14256,7 @@ namespace APT.BaseData.Services.DomainServices
                         //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
                         //departIds.Add(currentDepart.ID);
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 200)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                         if (parentId != null)
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
index 56ddfb7..b2956c8 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
@@ -7964,8 +7964,8 @@ namespace APT.BS.WebApi.Controllers.Api
                         {
                             switch (DEPARTMENT_TYPE)
                             {
-                                case 1:
-                                case 2:
+                                case 15:
+                                case 20:
                                     var approle = ApproveRole.FirstOrDefault(e => e.NAME.Contains("车间"));
                                     if (approle != null)
                                     {
@@ -7977,7 +7977,7 @@ namespace APT.BS.WebApi.Controllers.Api
                                         }
                                     }
                                     break;
-                                case 3:
+                                case 5:
                                     //公司级 给 安环部安全员
                                     var approleSafe = ApproveRole.FirstOrDefault(e => e.NAME.Contains("安"));
                                     if (approleSafe != null)
diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
index b099469..ae5ce72 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
@@ -1132,7 +1132,7 @@ namespace APT.BS.WebApi.Controllers.Api
                             modelDep20.CREATE_TIME = dtNow;
                             if (string.IsNullOrEmpty(modelDep20.CODE))
                             {
-                                modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 200).Count() + 1).ToString().PadLeft(2, '0');
+                                modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 20).Count() + 1).ToString().PadLeft(2, '0');
                             }
 
                             listDepAdd.Add(modelDep20);
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SCController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SCController.cs
index dadab5c..d93d288 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SCController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SCController.cs
@@ -322,7 +322,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
 
                                         switch (listFMUserNotice[k].Nav_Department.DEPARTMENT_TYPE)
                                         {
-                                            case 0:
+                                            case 10:
                                                 if (listFMUserNotice[k].DEPARTMENT_ID.HasValue)
                                                 {
                                                     depTemp = IListPlanSetDep.FirstOrDefault(e => e.DEPARTMENT_ID == listFMUserNotice[k].DEPARTMENT_ID.Value);
@@ -330,7 +330,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                                         isUserContent = true;
                                                 }
                                                 break;
-                                            case 1:
+                                            case 15:
                                                 if (listFMUserNotice[k].Nav_Department.PARENT_ID.HasValue)
                                                 {
                                                     depTemp = IListPlanSetDep.FirstOrDefault(e => e.DEPARTMENT_ID == listFMUserNotice[k].Nav_Department.PARENT_ID.Value);
@@ -338,7 +338,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                                         isUserContent = true;
                                                 }
                                                 break;
-                                            case 2:
+                                            case 20:
                                                 if (listFMUserNotice[k].Nav_Department.PARENT_ID.HasValue)
                                                 {
                                                     depCheck = listDepAdd.FirstOrDefault(e => e.ID == listFMUserNotice[k].Nav_Department.PARENT_ID.Value);
@@ -355,7 +355,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                                     }
                                                 }
                                                 break;
-                                            case 3:
+                                            case 5:
                                                 isUserContent = true;
                                                 break;
                                             default:
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
index 8df74e4..a9341a1 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
@@ -247,7 +247,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                         }
                                         if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级)
                                         {
-                                            departList = departs.Where(t => t.DEPARTMENT_TYPE == 200 && teamDepartIds.Contains(t.ID)).ToList();
+                                            departList = departs.Where(t => t.DEPARTMENT_TYPE == 20 && teamDepartIds.Contains(t.ID)).ToList();
                                         }
                                         if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.公司级)
                                         {
@@ -1853,7 +1853,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                     if (shopClass.Any())
                                     {
                                         var tempIds = shopClass.Select(t => t.ID).ToList();
-                                        var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 200).ToList();
+                                        var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList();
                                         if (tempIds.Any())
                                         {
                                             //每个车间汇总班组和车间
@@ -3254,7 +3254,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                 if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor)
                                 {
                                     //发给班长
-                                    var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 200 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
+                                    var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
                                     userIds.AddRange(userTempIds);
                                 }
                                 //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)
@@ -4816,7 +4816,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                 if (item.FirstOrDefault().PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor)
                                 {
                                     //发给班长
-                                    var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 200 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
+                                    var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
                                     userIds.AddRange(userTempIds);
                                 }
                                 //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)
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 3bfa8eb..91308b6 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -381,22 +381,22 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                             var type = user.Nav_Department?.DEPARTMENT_TYPE;
                             switch (type)
                             {
-                                case 0:
+                                case 10:
                                     item.DEPT_DEPARTMENT_ID = user.DEPARTMENT_ID;
                                     item.SHOP_DEPARTMENT_ID = null;
                                     item.CLASS_DEPARTMENT_ID = null;
                                     break;
-                                case 1:
+                                case 15:
                                     item.DEPT_DEPARTMENT_ID = department.ID;
                                     item.SHOP_DEPARTMENT_ID = user.DEPARTMENT_ID;
                                     item.CLASS_DEPARTMENT_ID = null;
                                     break;
-                                case 2:
+                                case 20:
                                     item.DEPT_DEPARTMENT_ID = department.PARENT_ID;
                                     item.SHOP_DEPARTMENT_ID = department.ID;
                                     item.CLASS_DEPARTMENT_ID = user.DEPARTMENT_ID;
                                     break;
-                                case 3:
+                                case 5:
                                     item.DEPT_DEPARTMENT_ID = null;
                                     item.SHOP_DEPARTMENT_ID = null;
                                     item.CLASS_DEPARTMENT_ID = null;
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
index ab0de75..0d9a458 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
@@ -133,12 +133,12 @@ namespace APT.SC.WebApi.Controllers.Api.SC
                                 //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
                                 switch (loginInfo.Nav_Department.DEPARTMENT_TYPE)
                                 {
-                                    case 0:
-                                    case 1:
+                                    case 10:
+                                    case 15:
                                         listUsers = FMUserService.GetUserContentNextHead(loginInfo.DEPARTMENT_ID.Value);
                                         break;
-                                    case 2:
-                                    case 3:
+                                    case 20:
+                                    case 5:
                                         //班组 = 2, 公司 = 3
                                         listUsers = FMUserService.GetDownUser(loginInfo.DEPARTMENT_ID.Value, new string[] { "Nav_Department", "Nav_Person.Nav_Post" });
                                         break;
@@ -1721,12 +1721,12 @@ namespace APT.SC.WebApi.Controllers.Api.SC
                                 //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
                                 switch (loginInfo.Nav_Department.DEPARTMENT_TYPE)
                                 {
-                                    case 0:
-                                    case 1:
+                                    case 10:
+                                    case 15:
                                         listUsers = FMUserService.GetUserContentNextHead(loginInfo.DEPARTMENT_ID.Value);
                                         break;
-                                    case 2:
-                                    case 3:
+                                    case 20:
+                                    case 5:
                                         //班组 = 2, 公司 = 3
                                         listUsers = FMUserService.GetDownUser(loginInfo.DEPARTMENT_ID.Value);//, new string[] { "Nav_Department" }, "Nav_Person.Nav_Post" 
                                         break;
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SCController/StandardCreateController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SCController/StandardCreateController.cs
index 7679142..c55b188 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SCController/StandardCreateController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SCController/StandardCreateController.cs
@@ -218,16 +218,16 @@ namespace APT.SC.WebApi.Controllers.Api.SCController
                             var type = userInfo.Nav_Department.DEPARTMENT_TYPE;
                             switch (type)
                             {
-                                case 0:
+                                case 10:
                                     entity.DEPARTMENT_TYPE = SCDepartmentType.公司;
                                     break;
-                                case 1:
+                                case 15:
                                     entity.DEPARTMENT_TYPE = SCDepartmentType.部门;
                                     break;
-                                case 2:
+                                case 20:
                                     entity.DEPARTMENT_TYPE = SCDepartmentType.车间;
                                     break;
-                                case 3:
+                                case 5:
                                     entity.DEPARTMENT_TYPE = SCDepartmentType.公司;
                                     break;
                                 default:
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
index 48d6937..2b30254 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
@@ -74,7 +74,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                     {
                         listUserCheck = GetEntities<T_FM_USER>(e => listCode.Contains(e.CODE), null, null);
                     }
-
+                    int index = 0;
                     foreach (var item in Nav_NewUserDetail)
                     {
                         var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID);
@@ -83,11 +83,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                         {
                             if (string.IsNullOrEmpty(item.CODE))
                             {
-                                throw new Exception("请填写" + item.Nav_User.NAME + "的工号!");
+                                throw new Exception("请填写行：" + (index + 1) + "的工号!");
                             }
                             if (item.USER_POST_ID == Guid.Empty || item.USER_POST_ID == null)
                             {
-                                throw new Exception("请填写" + item.Nav_User.NAME + "的岗位!");
+                                throw new Exception("请填写行：" + (index + 1) + "的岗位!");
                             }
                         }
                         if (listUserCheck != null && listUserCheck.Count() > 0 && !string.IsNullOrEmpty(item.CODE) && item.USER_ID.HasValue)
@@ -98,6 +98,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                                 throw new Exception("工号不能重复【" + item.CODE + "】!");
                             }
                         }
+                        index++;
                     }
                     if (entity.TRAIN_STATUS == SEThreeLevelSafeTrainType.公司级)
                     {
@@ -114,7 +115,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                             {
                                 item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID;
                             }
-                            else if (dep.DEPARTMENT_TYPE == 200)
+                            else if (dep.DEPARTMENT_TYPE == 20)
                             {
                                 item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID;
                             }
@@ -891,7 +892,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                     {
                         switch (departInfo.DEPARTMENT_TYPE)//FMDepartmentType 部门=0,  车间=1,   班组=2,  公司=3
                         {
-                            case 2:
+                            case 20:
                                 sendUser = userApprol.FirstOrDefault(e => e.Nav_ApproveRole.NAME.Contains("负责人"));
                                 break;
                             default:

From 7e939e97d7d37669892a388d17ea221d4b8fe6c2 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Thu, 20 Nov 2025 12:16:21 +0800
Subject: [PATCH 3/3] 2134

---
 APT.MicroApi/APT.BD.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.BS.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.FM.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.FO.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.HM.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.LG.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.NW.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.OP.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.PF.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.PP.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.SC.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.SK.WebApi/Properties/launchSettings.json | 2 +-
 APT.MicroApi/APT.UT.WebApi/Properties/launchSettings.json | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/APT.MicroApi/APT.BD.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.BD.WebApi/Properties/launchSettings.json
index 6af5eba..9293ad0 100644
--- a/APT.MicroApi/APT.BD.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.BD.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": true,
 			"applicationUrl": "http://localhost:5101"
diff --git a/APT.MicroApi/APT.BS.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.BS.WebApi/Properties/launchSettings.json
index 5d811a6..bf846ad 100644
--- a/APT.MicroApi/APT.BS.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.BS.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": true,
 			"applicationUrl": "http://localhost:5178"
diff --git a/APT.MicroApi/APT.FM.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.FM.WebApi/Properties/launchSettings.json
index c3ffe47..b2eb9dd 100644
--- a/APT.MicroApi/APT.FM.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.FM.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": false,
 			"applicationUrl": "http://localhost:5107"
diff --git a/APT.MicroApi/APT.FO.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.FO.WebApi/Properties/launchSettings.json
index 1dd18c5..fa11d86 100644
--- a/APT.MicroApi/APT.FO.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.FO.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"applicationUrl": "http://localhost:5119",
 			"nativeDebugging": false
diff --git a/APT.MicroApi/APT.HM.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.HM.WebApi/Properties/launchSettings.json
index 85bb6d0..6c72f30 100644
--- a/APT.MicroApi/APT.HM.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.HM.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": true,
 			"applicationUrl": "http://localhost:5117"
diff --git a/APT.MicroApi/APT.LG.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.LG.WebApi/Properties/launchSettings.json
index 65b817f..d29baa5 100644
--- a/APT.MicroApi/APT.LG.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.LG.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": false,
 			"applicationUrl": "http://localhost:5109"
diff --git a/APT.MicroApi/APT.NW.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.NW.WebApi/Properties/launchSettings.json
index 1dbd158..9c9e43c 100644
--- a/APT.MicroApi/APT.NW.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.NW.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": false,
 			"applicationUrl": "http://localhost:5111"
diff --git a/APT.MicroApi/APT.OP.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.OP.WebApi/Properties/launchSettings.json
index d62125f..3548ec2 100644
--- a/APT.MicroApi/APT.OP.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.OP.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": false,
 			"applicationUrl": "http://localhost:5116"
diff --git a/APT.MicroApi/APT.PF.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.PF.WebApi/Properties/launchSettings.json
index f48dd32..168f329 100644
--- a/APT.MicroApi/APT.PF.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.PF.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": false,
 			"applicationUrl": "http://localhost:5112"
diff --git a/APT.MicroApi/APT.PP.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.PP.WebApi/Properties/launchSettings.json
index 8e34f97..4c29381 100644
--- a/APT.MicroApi/APT.PP.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.PP.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"applicationUrl": "http://localhost:5118",
 			"nativeDebugging": false
diff --git a/APT.MicroApi/APT.SC.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.SC.WebApi/Properties/launchSettings.json
index 5a40fb5..430253c 100644
--- a/APT.MicroApi/APT.SC.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.SC.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": true,
 			"applicationUrl": "http://localhost:5179"
diff --git a/APT.MicroApi/APT.SK.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.SK.WebApi/Properties/launchSettings.json
index 368ad11..ce3d4ce 100644
--- a/APT.MicroApi/APT.SK.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.SK.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"applicationUrl": "http://localhost:5180",
 			"nativeDebugging": false
diff --git a/APT.MicroApi/APT.UT.WebApi/Properties/launchSettings.json b/APT.MicroApi/APT.UT.WebApi/Properties/launchSettings.json
index 0ccd949..24e1730 100644
--- a/APT.MicroApi/APT.UT.WebApi/Properties/launchSettings.json
+++ b/APT.MicroApi/APT.UT.WebApi/Properties/launchSettings.json
@@ -5,7 +5,7 @@
 			"commandName": "Project",
 			"launchUrl": "api/values",
 			"environmentVariables": {
-				"ASPNETCORE_ENVIRONMENT": "Test"
+				"ASPNETCORE_ENVIRONMENT": "Pdev"
 			},
 			"nativeDebugging": false,
 			"applicationUrl": "http://localhost:5177"