1代码合并

2025-02-05 17:57:14 +08:00
parent 4bbce72980
commit 5712066e0a
57 changed files with 334 additions and 3709 deletions
@@ -21,8 +21,7 @@ namespace BLL
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
                var getDataLists = (from x in db.EduTrain_TrainRecord
-                                    where ((string.IsNullOrEmpty(projectId) && x.ProjectId == null) 
-                                    || (!string.IsNullOrEmpty(projectId) && (x.ProjectId == null || x.ProjectId == ""))) && x.TrainTypeId == trainTypeId
+                                    where x.ProjectId == projectId && x.TrainTypeId == trainTypeId
                                    orderby x.TrainStartDate descending
                                    select new Model.TrainRecordItem
                                    {