From 8a897b5df784710f658f38f4efb1dfccbacd0949 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Mon, 30 Dec 2024 10:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5=E3=80=81=E5=91=A8=E6=8A=A5=EF=BC=8C=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/BLL.csproj                           |   2 +-
 .../ManageReportNew/MonthReportEdit.aspx.cs   | 117 +++++++++---------
 .../ManageReportNew/WeekReportEdit.aspx.cs    |  41 +++---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   2 +-
 4 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index a448f80e..e5110069 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -1110,7 +1110,7 @@
       <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Permissions">
-      <Version>4.7.0</Version>
+      <Version>6.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Principal.Windows">
       <Version>4.7.0</Version>
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index b380ad97..a99f252c 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -244,63 +244,68 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     #region 加载文本框内容
                     var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
+                    if (txtReportList.Count>0)
                     {
-                        txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
-                    {
-                        txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
-                    {
-                        txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
-                    {
-                        txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
-                    {
-                        txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
-                    {
-                        txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
-                    {
-                        txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
-                    {
-                        imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
-                        txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
-                    {
-                        imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
-                        txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
-                    {
-                        imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
-                        txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
-                    {
-                        imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
-                        txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
-                    {
-                        imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
-                        txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
-                    }
-                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
-                    {
-                        imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
-                        txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
+                        {
+                            txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
+                        {
+                            txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
+                        {
+                            txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
+                        {
+                            txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
+                        {
+                            txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
+                        {
+                            txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
+                        {
+                            txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
+                        {
+                            imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
+                            txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
+                        {
+                            imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
+                            txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
+                        {
+                            imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
+                            txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
+                        {
+                            imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
+                            txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
+                        {
+                            imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
+                            txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
+                        }
+                        if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
+                        {
+                            imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
+                            txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                        }
+
+
                     }
                     #endregion
 
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index 37905120..9aa69bad 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -221,27 +221,30 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     #region 加载文本框内容
                     var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
-                    txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
-                    txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
-                    txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+                    if (txtReportList.Count>0)
+                    {
+                        txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                        txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                        txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
 
-                    txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
-                    txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
-                    txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
-                    txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
+                        txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                        txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                        txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                        txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
 
-                    imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
-                    txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
-                    imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
-                    txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
-                    imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
-                    txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
-                    imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
-                    txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
-                    imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
-                    txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
-                    imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
-                    txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                        imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
+                        txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
+                        imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
+                        txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
+                        imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
+                        txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
+                        imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
+                        txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
+                        imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
+                        txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
+                        imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
+                        txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                    }
                     #endregion
 
                     //加载所有grid
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index f605c87c..d683e6a7 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19325,7 +19325,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">