解决查询bug

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/DeviceTestViewModel.cs

@@ -153,8 +153,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             conditionDevices = (from a in allDeviceList
                                 where (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
                                 && (string.IsNullOrEmpty(DeviceNo) ? true : (a.DeviceNo == DeviceNo))
-                                && (DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName)
-                                   && (ProjectName == "---") ? true : (a.ProjectName == ProjectName)
+                                 && ((DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName))
+                                   && ((ProjectName == "---") ? true : (a.ProjectName == ProjectName))
                                 select a).ToList();
             //默认显示的第一页
             conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ResultQueryViewModel.cs

@@ -154,8 +154,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             conditionDevices = (from a in allDeviceList
                                 where (string.IsNullOrEmpty(DeviceName) ? true : (a.DeviceName == DeviceName))
                                 && (string.IsNullOrEmpty(DeviceNo) ? true : (a.DeviceNo == DeviceNo))
-                                  && (DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName)
-                                   && (ProjectName == "---") ? true : (a.ProjectName == ProjectName)
+                                  && ((DeviceKindName == "---") ? true : (a.DeviceKindName == DeviceKindName))
+                                   && ((ProjectName == "---") ? true : (a.ProjectName == ProjectName))
                                 select a).ToList();
             //默认显示的第一页
             conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();

BlankApp1/BlankApp1/Views/MainWindow.xaml

@@ -149,7 +149,7 @@
                         </EllipseGeometry>
                     </Path.Data>
                 </Path>
-                <TextBlock Text="V1.2" Style="{StaticResource txtHeadStyle}" Width="60" Margin="30,0,12,0"/>
+                <TextBlock Text="V1.3" Style="{StaticResource txtHeadStyle}" Width="60" Margin="30,0,12,0"/>
             </StackPanel>
 
         </Border>