username@email.com
2026-03-24 3007002f79b9f234274a07c2490d0105f322c8e8
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -329,13 +329,23 @@
        /// <param name="EvaluationStatus"></param>
        /// <param name="RewardType"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null)
        public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null, Guid? TrueMemberId = null)
        {
            try
            {
                string condition = " 1=1 ";
                if (MemberId != Guid.Empty)
                    condition += " and a.MemberId = '" + MemberId + "'";
                if (TrueMemberId.HasValue)
                {
                    if(TrueMemberId!=Guid.Parse("764152EE-1184-44DF-A8B2-316FAFF0D3E4") && TrueMemberId != Guid.Parse("FAAF2DCA-4739-409F-BF5A-6AABDE57AC12") && TrueMemberId != Guid.Parse("AE770137-A3F2-4C73-A4A8-9F1CC2AB5B81") && TrueMemberId != Guid.Parse("88B49967-D590-452C-93C6-0049A75FA5FF"))
                    {
                        condition += " and a.PlanDataType != 20 ";
                    }
                }
                if (SentStaffId != Guid.Empty)
                    condition += " and a.SentStaffId = '" + SentStaffId + "'";
@@ -381,6 +391,9 @@
                {
                        condition += " and a.ApprovalStatus != '" + BaocunStatus + "'";
                }
                if (EvaluationStatus >= 0)
                {
                    if (EvaluationStatus == 5)