diff --git a/.vs/HighWayIot/FileContentIndex/21b1456a-0c21-4485-b883-6c3eaa1cc107.vsidx b/.vs/HighWayIot/FileContentIndex/21b1456a-0c21-4485-b883-6c3eaa1cc107.vsidx new file mode 100644 index 00000000..45a0ebd8 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/21b1456a-0c21-4485-b883-6c3eaa1cc107.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/72a3e463-b445-44f5-abb7-1d8aa35c8e9b.vsidx b/.vs/HighWayIot/FileContentIndex/72a3e463-b445-44f5-abb7-1d8aa35c8e9b.vsidx deleted file mode 100644 index 934f55a6..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/72a3e463-b445-44f5-abb7-1d8aa35c8e9b.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/a8a2f768-7996-4744-b325-64cdacccd2a8.vsidx b/.vs/HighWayIot/FileContentIndex/a8a2f768-7996-4744-b325-64cdacccd2a8.vsidx new file mode 100644 index 00000000..e549c115 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/a8a2f768-7996-4744-b325-64cdacccd2a8.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/d2b7e7cb-41a3-4c02-a1ee-e0b700502ff1.vsidx b/.vs/HighWayIot/FileContentIndex/d2b7e7cb-41a3-4c02-a1ee-e0b700502ff1.vsidx deleted file mode 100644 index 2de717e4..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/d2b7e7cb-41a3-4c02-a1ee-e0b700502ff1.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/e979e27a-5a9b-41f4-be3a-c07aef021a4d.vsidx b/.vs/HighWayIot/FileContentIndex/e979e27a-5a9b-41f4-be3a-c07aef021a4d.vsidx deleted file mode 100644 index 9c1dbcce..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/e979e27a-5a9b-41f4-be3a-c07aef021a4d.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f1307dd3-184f-4822-ba1f-6442b122e57a.vsidx b/.vs/HighWayIot/FileContentIndex/f1307dd3-184f-4822-ba1f-6442b122e57a.vsidx new file mode 100644 index 00000000..7732abe4 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f1307dd3-184f-4822-ba1f-6442b122e57a.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index a9d93763..7185071b 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 7f1124dc..e27cbd45 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -234,7 +234,7 @@ namespace Aucma.Scada.Business if (spaceDetails.Count > 0) { spaceDetails = spaceDetails.Where(x => x.isFlag != 1).ToList(); - if (spaceDetails != null) + if (spaceDetails.Count > 0) { spaceDetail = spaceDetails.OrderBy(x => x.createTime).First(); } diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index ed9557e3..332ef52c 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 01efa396..b15c3ddd 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index ed9557e3..332ef52c 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index 01efa396..b15c3ddd 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index ed9557e3..332ef52c 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index 01efa396..b15c3ddd 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 86a1bf41..4b034eab 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ