Merge remote-tracking branch 'origin/master' into cyronghe

移动系统liao

2025-02-08 8c8404c55a863844cc674a8bedb2cfdb92c1c288

 cylsg/cylsg.Application/CyOS/CyOSBaoXiaoCaiWuController.cs

@@ -42,7 +42,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 +158,7 @@
                    try
                    {
                        data.EvaluationStatus = BaoxiaoStausType.Reimbursed;
                        data.PlanContent = plan.PlanContent;
                        //data.PlanContent = plan.PlanContent;
                        data.LastUpdateTime = DateTime.Now;
                        await _SugarClient.Updateable(data).ExecuteCommandAsync();