Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

2026-07-03 15:51:20 +08:00 · 2026-07-03 15:51:18 +08:00
2 changed files with 6 additions and 3 deletions
@@ -263,10 +263,13 @@ namespace SunlightAggregationManager.UserClass

                    var groups = MainWindowViewModel.Selet_Memory(MainWindowViewModel._userData,
                        "Groups", "User='" + person?.User + "'");
+                    var department = MainWindowViewModel.Selet_Memory(MainWindowViewModel._userData,
+                        "Department", "User='" + person?.User + "'");

-                   DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("" +
-                        "select * from Notification WHERE Groups='" + groups + "' and Id>'" +
-                        s_ + "'", null)?.Tables[0] ?? new DataTable();
+
+                    DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("" +
+                        "select * from Notification WHERE Groups='" + groups + "'and Department='" +
+                        "' and Id>'" + s_ + "'", null)?.Tables[0] ?? new DataTable();
                   if(resultTable.Rows.Count==0) resultTable.Rows.Add();

                    //格式化返回信息
Author	SHA1	Message	Date
Administrator	ffc9b3d425	Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager	2026-07-03 15:51:20 +08:00
Administrator	d9d00cc9fa	Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager	2026-07-03 15:51:18 +08:00