diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassSearchAnalysis.cs b/ClassSearchAnalysis.cs index 231533e..73b46c2 100644 --- a/ClassSearchAnalysis.cs +++ b/ClassSearchAnalysis.cs @@ -114,11 +114,11 @@ { if (filedValueList[i].ToString() == "无") { - sql += " or 材质 is null"; + sql += " or "+filedObject+" is null"; } else { - sql += " or 材质 = '" + filedValueList[i].ToString() + "'"; + sql += " or " + filedObject + " = '" + filedValueList[i].ToString() + "'"; } } } diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassSearchAnalysis.cs b/ClassSearchAnalysis.cs index 231533e..73b46c2 100644 --- a/ClassSearchAnalysis.cs +++ b/ClassSearchAnalysis.cs @@ -114,11 +114,11 @@ { if (filedValueList[i].ToString() == "无") { - sql += " or 材质 is null"; + sql += " or "+filedObject+" is null"; } else { - sql += " or 材质 = '" + filedValueList[i].ToString() + "'"; + sql += " or " + filedObject + " = '" + filedValueList[i].ToString() + "'"; } } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 10b7a12..a62aae8 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassSearchAnalysis.cs b/ClassSearchAnalysis.cs index 231533e..73b46c2 100644 --- a/ClassSearchAnalysis.cs +++ b/ClassSearchAnalysis.cs @@ -114,11 +114,11 @@ { if (filedValueList[i].ToString() == "无") { - sql += " or 材质 is null"; + sql += " or "+filedObject+" is null"; } else { - sql += " or 材质 = '" + filedValueList[i].ToString() + "'"; + sql += " or " + filedObject + " = '" + filedValueList[i].ToString() + "'"; } } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 10b7a12..a62aae8 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index ef30da2..b204971 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassSearchAnalysis.cs b/ClassSearchAnalysis.cs index 231533e..73b46c2 100644 --- a/ClassSearchAnalysis.cs +++ b/ClassSearchAnalysis.cs @@ -114,11 +114,11 @@ { if (filedValueList[i].ToString() == "无") { - sql += " or 材质 is null"; + sql += " or "+filedObject+" is null"; } else { - sql += " or 材质 = '" + filedValueList[i].ToString() + "'"; + sql += " or " + filedObject + " = '" + filedValueList[i].ToString() + "'"; } } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 10b7a12..a62aae8 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index ef30da2..b204971 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index 5da8708..c3bc888 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassSearchAnalysis.cs b/ClassSearchAnalysis.cs index 231533e..73b46c2 100644 --- a/ClassSearchAnalysis.cs +++ b/ClassSearchAnalysis.cs @@ -114,11 +114,11 @@ { if (filedValueList[i].ToString() == "无") { - sql += " or 材质 is null"; + sql += " or "+filedObject+" is null"; } else { - sql += " or 材质 = '" + filedValueList[i].ToString() + "'"; + sql += " or " + filedObject + " = '" + filedValueList[i].ToString() + "'"; } } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 10b7a12..a62aae8 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index ef30da2..b204971 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index 5da8708..c3bc888 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe index ef30da2..b204971 100644 --- a/obj/x64/Debug/Cyberpipe.exe +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/ClassGSOTool.cs b/ClassGSOTool.cs index 529fddc..c62bd08 100644 --- a/ClassGSOTool.cs +++ b/ClassGSOTool.cs @@ -232,10 +232,8 @@ /// private static GSOFeatures getFeaturesByFilter(GSOFeatures features, string fieldName) { - if (features == null) - { - return null; - } + if (features == null) return null; + GSOFeatures featuresGet = new GSOFeatures(); for (int i = 0; i < features.Length; i++) { diff --git a/ClassSearchAnalysis.cs b/ClassSearchAnalysis.cs index 231533e..73b46c2 100644 --- a/ClassSearchAnalysis.cs +++ b/ClassSearchAnalysis.cs @@ -114,11 +114,11 @@ { if (filedValueList[i].ToString() == "无") { - sql += " or 材质 is null"; + sql += " or "+filedObject+" is null"; } else { - sql += " or 材质 = '" + filedValueList[i].ToString() + "'"; + sql += " or " + filedObject + " = '" + filedValueList[i].ToString() + "'"; } } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 10b7a12..a62aae8 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index ef30da2..b204971 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb index 5da8708..c3bc888 100644 --- a/bin/x86/Debug/Cyberpipe.pdb +++ b/bin/x86/Debug/Cyberpipe.pdb Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.exe b/obj/x64/Debug/Cyberpipe.exe index ef30da2..b204971 100644 --- a/obj/x64/Debug/Cyberpipe.exe +++ b/obj/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/x64/Debug/Cyberpipe.pdb b/obj/x64/Debug/Cyberpipe.pdb index 5da8708..c3bc888 100644 --- a/obj/x64/Debug/Cyberpipe.pdb +++ b/obj/x64/Debug/Cyberpipe.pdb Binary files differ