20221019 人员派遣功能实现

SGGL/BLL/SysManage/UnitService.cs

@@ -236,20 +236,17 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var units = (from x in db.Base_Unit
-                             orderby x.UnitCode
-                             select x).ToList();
-                if (!string.IsNullOrEmpty(projectId))
+                var units = from x in db.Base_Unit
+                            select x;
+                if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null)
                 {
-                    units = (from x in units
-                             join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
-                             where y.ProjectId == projectId
-                             select x).ToList();
+                    units = from x in units
+                            join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
+                            where y.ProjectId == projectId
+                            select x;
                 }
 
-                units = units.OrderBy(x => x.UnitCode).ToList();
-
-                return units;
+                return units.OrderBy(x => x.UnitCode).ToList(); ;
             }
         }