From 6bfd33b0a5f4c21ff8d7c015523394fac99f9888 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 22 一月 2025 12:11:57 +0800
Subject: [PATCH] 最后变更，删除主管分部门审批
---
cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
index d255339..6ec8bcd 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs
@@ -46,7 +46,7 @@
SearchList = SearchList.And(x => x.PlanDataType == 17);
//SearchList = SearchList.And(x => x.ApprovalStatus == PlanStatusType.unApproval);
//SearchList = SearchList.And(x => x.OaWorkPlanShenpis.Where(y => y.Buzhou == 1 && y.ApprovalStaffId == Permissions.MemberId).Count()<=0);
- SearchList = SearchList.And(x => x.DepartId == Permissions.DepartId);
+ //SearchList = SearchList.And(x => x.DepartId == Permissions.DepartId); 閮ㄩ棬绛涢��
if (!string.IsNullOrEmpty(param.StaffName))
{
SearchList = SearchList.And(x => x.SentStaff.Name.Contains(param.StaffName));
@@ -135,7 +135,18 @@
{
throw Oops.Oh("娌℃湁鏉冮檺");
}
- return await _SugarClient.Queryable<OaWorkPlan>().Includes(x => x.OaWorkPlanShenpis.Where(y => y.Buzhou == 1).ToList(), y => y.ApprovalStaff).Includes(x => x.SentStaff).Includes(x => x.Depart).Includes(x => x.WorkPlanAttachments).Where(x=>x.Keyid==id).FirstAsync();
+ return await _SugarClient.Queryable<OaWorkPlan>().Includes(x => x.OaWorkPlanShenpis.Where(y => y.Buzhou == 1).ToList(), y => y.ApprovalStaff).Includes(x => x.SentStaff).Includes(x => x.Depart).Includes(x => x.WorkPlanAttachments).Where(x=>x.Keyid==id).Mapper(x=>
+ {
+ if (x.ApprovalStatus == PlanStatusType.unApproval)
+ {
+ var oashenpi = x.OaWorkPlanShenpis?.Where(x=>x.ApprovalStaffId==Permissions.MemberId).FirstOrDefault();
+ if (oashenpi != null)
+ x.ApprovalStatus = oashenpi.ApprovalStatus;
+
+
+ }
+ ;
+ }).FirstAsync();
}
/// <summary>
--
Gitblit v1.9.1