From 62b8ea8da758e0ad8c285a4d857b8a6991ec11d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Wed, 10 Apr 2024 09:19:29 +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=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CrucialLicenseJobController.cs | 17 ++++++++++------- .../CrucialLicenseJobOutsourceController.cs | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index d78f815..48b2243 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -968,14 +968,17 @@ namespace APT.FO.WebApi.Controllers } else { - var dep = GetEntity(user.DEPARTMENT_ID.Value); - if (dep != null) + if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) { - if (dep.USER_ID.HasValue) - { approveId = dep.USER_ID.Value; } - else if (dep.CHARGEUSER_ID.HasValue) - { approveId = dep.CHARGEUSER_ID.Value; } - break; + var dep = GetEntity(user.DEPARTMENT_ID.Value); + if (dep != null) + { + if (dep.USER_ID.HasValue) + { approveId = dep.USER_ID.Value; } + else if (dep.CHARGEUSER_ID.HasValue) + { approveId = dep.CHARGEUSER_ID.Value; } + break; + } } } } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 0626dc8..f6677f0 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -456,14 +456,17 @@ namespace APT.FO.WebApi.Controllers } else { - var dep = GetEntity(user.DEPARTMENT_ID.Value); - if (dep != null) + if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) { - if (dep.USER_ID.HasValue) - { approveId = dep.USER_ID.Value; } - else if (dep.CHARGEUSER_ID.HasValue) - { approveId = dep.CHARGEUSER_ID.Value; } - break; + var dep = GetEntity(user.DEPARTMENT_ID.Value); + if (dep != null) + { + if (dep.USER_ID.HasValue) + { approveId = dep.USER_ID.Value; } + else if (dep.CHARGEUSER_ID.HasValue) + { approveId = dep.CHARGEUSER_ID.Value; } + break; + } } } }