From 7eca0ab1b6d5142d623efd471985b2a20b559616 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期一, 01 十二月 2025 10:55:02 +0800
Subject: [PATCH] 修正审批备注长度

---
 cylsg/cylsg.Application/CyOS/CyOSBaoXiaoCaiWuController.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoCaiWuController.cs b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoCaiWuController.cs
index f839286..73b41d9 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoCaiWuController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSBaoXiaoCaiWuController.cs
@@ -17,6 +17,7 @@
     /// 璐㈠姟鎶ラ攢鎺у埗鍣�
     /// </summary>
     [Authorize]
+    [ApiDescriptionSettings("CYOA")]
     public  class CyOSBaoXiaoCaiWuController: IDynamicApiController
     {
         private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1);
@@ -42,7 +43,7 @@
             }
 
             Expression<Func<OaWorkPlan, bool>> SearchList = (x) => true;
-
+            SearchList = SearchList.And(x => x.ApprovalStatus != PlanStatusType.Uncommitted);
             //宸濆嵃宸ヤ綔鍗�
             SearchList = SearchList.And(x => x.MemberId == _OAServices.firmId);
             SearchList = SearchList.And(x => x.PlanType == 3);
@@ -158,7 +159,7 @@
                     try
                     {
                         data.EvaluationStatus = BaoxiaoStausType.Reimbursed;
-                        data.PlanContent = plan.PlanContent;
+                        //data.PlanContent = plan.PlanContent;
                         data.LastUpdateTime = DateTime.Now;
                         await _SugarClient.Updateable(data).ExecuteCommandAsync();
 
@@ -172,7 +173,7 @@
                             AccountId = FirmAccount.Keyid,
                             Money = data.PlanMoney ?? 0,
                             LastUpdateTime = DateTime.Now,
-                            Department = data.PlanContent,
+                            Department = data?.Depart?.Name??"",
                             RecordTypeId = 2,
                             SubjectId = 3,//鎶ラ攢蹇呴』涓�3
                             Operator = Permissions.Name,

--
Gitblit v1.9.1