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

UserClass/AsyncTcpClient.cs

@@ -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>'" +
+                    DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("" +
-                        s_ + "'", null)?.Tables[0] ?? new DataTable();
+                        "select * from Notification WHERE Groups='" + groups + "'and Department='" +
+                        "' and Id>'" + s_ + "'", null)?.Tables[0] ?? new DataTable();
                    if(resultTable.Rows.Count==0) resultTable.Rows.Add();
 
                     //格式化返回信息