From bd778dbefb5662195f670db2e5043f07f7c1b8ee 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, 17 Dec 2025 11:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=89=BE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrucialLicenseJobController.cs            | 32 ++++++++++++++++++-
 .../CrucialLicenseJobOutsourceController.cs   | 32 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
index 559684c..d59dcde 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
@@ -851,7 +851,37 @@ namespace APT.FO.WebApi.Controllers
             var zbRoles = roles.FirstOrDefault(t => t.NAME.Contains("值班"));
             var sdRoles = roles.Where(t => t.NAME.Contains("属地")).ToList();
             var roleIds = sdRoles.Select(t => t.ID).ToList();
-            if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
+            var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.ID == approveTempDetail.APPROVE_ROLE_ID);
+            if (approveRole != null && approveRole.NAME == "分管领导")
+            {
+                var user = users.FirstOrDefault(t => t.ID == loginUserId);
+                if (user.DEPARTMENT_ID != null)
+                {
+                    List<Guid> departmentIds = new List<Guid>();
+                    GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
+                    if (departmentIds.Any())
+                    {
+                        var dep = GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == approveRole.DEPARTMENT_TYPE);
+                        if (dep != null && dep.CHARGEUSER_ID != null)
+                        {
+                            approveId = dep.CHARGEUSER_ID;
+                        }
+                        else
+                        {
+                            return approveId;
+                        }
+                    }
+                    else
+                    {
+                        return approveId;
+                    }
+                }
+                else
+                {
+                    return approveId;
+                }
+            }
+            else if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
             {
                 var job = this.GetEntity<T_FO_SCHEDULING>(t=>t.DATE.Date == DateTime.Now.Date);
                 if (job != null)
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
index a987733..68c3bbc 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
@@ -576,7 +576,37 @@ namespace APT.FO.WebApi.Controllers
             var zbRoles = roles.FirstOrDefault(t => t.NAME.Contains("值班"));
             var sdRoles = roles.Where(t => t.NAME.Contains("属地")).ToList();
             var roleIds = sdRoles.Select(t => t.ID).ToList();
-            if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
+            var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.ID == approveTempDetail.APPROVE_ROLE_ID);
+            if (approveRole != null && approveRole.NAME == "分管领导")
+            {
+                var user = users.FirstOrDefault(t => t.ID == loginUserId);
+                if (user.DEPARTMENT_ID != null)
+                {
+                    List<Guid> departmentIds = new List<Guid>();
+                    GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
+                    if (departmentIds.Any())
+                    {
+                        var dep = GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == approveRole.DEPARTMENT_TYPE);
+                        if (dep != null && dep.CHARGEUSER_ID != null)
+                        {
+                            approveId = dep.CHARGEUSER_ID;
+                        }
+                        else
+                        {
+                            return approveId;
+                        }
+                    }
+                    else
+                    {
+                        return approveId;
+                    }
+                }
+                else
+                {
+                    return approveId;
+                }
+            }
+            else if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
             {
                 var job = this.GetEntity<T_FO_SCHEDULING>(t => t.DATE.Date == DateTime.Now.Date);
                 if (job != null)