合并最新

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