合并最新

2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -21,7 +21,7 @@ namespace BLL
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
                var getDataLists = (from x in db.EduTrain_TrainRecord
-                                    where x.ProjectId == projectId && x.TrainTypeId == trainTypeId
+                                    where ((string.IsNullOrEmpty(projectId) && x.ProjectId == null) || (!string.IsNullOrEmpty(projectId) && x.ProjectId == projectId)) && x.TrainTypeId == trainTypeId
                                    orderby x.TrainStartDate descending
                                    select new Model.TrainRecordItem
                                    {