20230530集团看板数据来源页面添加

2023-05-30 08:52:00 +08:00
parent 9c804196e7
commit f4b1c42fa9
118 changed files with 18934 additions and 137 deletions
@@ -639,10 +639,16 @@ namespace BLL
            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
            {
                List<Model.Person_Persons> list = new List<Model.Person_Persons>();
-                list = (from x in db.Person_Persons
-                        where x.UnitId == unitId && x.DepartId == DepartId
-                        orderby x.PersonName
-                        select x).ToList();
+                var getPersons = from x in db.Person_Persons select x;
+                if (!string.IsNullOrEmpty(unitId))
+                {
+                    getPersons = getPersons.Where(x => x.UnitId == unitId);
+                }
+                if (!string.IsNullOrEmpty(DepartId))
+                {
+                    getPersons = getPersons.Where(x => x.DepartId == DepartId);
+                }
+                list = getPersons.OrderBy(x=>x.UnitId).OrderBy(x=>x.PersonName).ToList();
                return list;
            }
        }