From ce25fafc6eba3674d0f6c7f17c2dace254c2f552 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: Sat, 9 May 2026 11:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/PF/PFApproveCallBackService.cs                  | 5 +++--
 APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs   | 5 +++--
 APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs   | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 14f6082..221b00f 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -13412,6 +13412,7 @@ namespace APT.BaseData.Services.DomainServices
                         }
                     }
                     var requre = this.GetEntity<T_SK_REQUEST>(t => !t.IS_DELETED);
+                    var plan = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.ID == entity.IDENTIFY_EVALUATION_PLAN_ID);
                     var filter = new BaseFilter(entity.ORG_ID);
                     filter.IgnoreDataRule = true;
                     Expression<Func<T_SK_RISK_IDENTIFY, bool>> expression = i => i.IS_DELETED == false && i.IDENTIFY_EVALUATION_PLAN_ID == entity.IDENTIFY_EVALUATION_PLAN_ID && departIds.Contains((Guid)i.APPLY_DEPARTMENT_ID);
@@ -13429,8 +13430,8 @@ namespace APT.BaseData.Services.DomainServices
                         result.YEAR = entity.YEAR;
                         result.ISAUTO = true;
                         result.CONTENTS = entity.CONTENTS;
-                        result.START_DATE = entity.START_DATE;
-                        result.END_DATE = entity.END_DATE;
+                        result.START_DATE = plan?.START_DATE;
+                        result.END_DATE = plan?.END_DATE;
                         result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID;
                         result.ISCOMPANY = currentDepart.DEPARTMENT_TYPE == 5 ? SKIsStoreEnum.Yes : SKIsStoreEnum.No;
                         var planTemp = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.ID == entity.IDENTIFY_EVALUATION_PLAN_ID, "Nav_Requires");
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
index 22221a0..25cb447 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
@@ -2789,8 +2789,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     var departs = this.GetEntities_noneBase<T_FM_DEPARTMENT>(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.Class);
                     var departIds = departs.Select(t => t.ID).ToList();
                     var teams = this.GetEntities_noneBase<T_FM_TEAM>(t => true);
-                    var teamPersons = this.GetEntities< T_FM_TEAM_PERSON> (t =>true, new BaseFilter(filter.OrgId));
-                    var users = this.GetEntities<T_FM_USER>(t => t.DEPARTMENT_ID != null && departIds.Contains((Guid)t.DEPARTMENT_ID),new BaseFilter(filter.OrgId));
+                    var teamPersons = this.GetEntities< T_FM_TEAM_PERSON> (t =>true, new BaseFilter(filter.OrgId));
+                    var userAlls = this.GetEntities<T_FM_USER>(t => true, new BaseFilter(filter.OrgId));
+                    var users = userAlls.Where(t => t.DEPARTMENT_ID != null && departIds.Contains((Guid)t.DEPARTMENT_ID) && t.ENABLE_STATUS == 0);
                     if (departIds != null && departIds.Any())
                     {
                         foreach (var item in departIds)
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
index 67029ba..ada11e8 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
@@ -5566,8 +5566,8 @@ namespace APT.PP.WebApi.Controllers.Api
                                 }
                                 if (item.CheckPost == "班组负责人")
                                 {
-                                    //判断排班//取消人员排班判断&& teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)
-                                    userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
+                                    //判断排班
+                                    userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
                                 }
                                 if (userInfo == null && item.CheckDepartId != null && item.CheckPost != "班组负责人")
                                 {