From 24de50cd30acbb4c5c4cd349102389b49fad3ca7 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 4 Sep 2024 09:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZHGL/Environmental/ArchitectureReportSave.aspx.cs  | 10 +++++-----
 .../ZHGL/Environmental/ChemicalReportSave.aspx.cs      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
index 1db3c6e5..aff828e5 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
@@ -103,7 +103,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     drpQuarters.SelectedValue = quarters;
                     drpYear.SelectedValue = year;
                     txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    txtDutyPerson.Text = this.CurrUser.UserName;
+                    txtDutyPerson.Text = this.CurrUser.PersonName;
                     //增加明细集合
                     GetNewItems(year, quarters);
                     this.Grid1.DataSource = items;
@@ -1219,7 +1219,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 {
                     report.ArchitectureReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ArchitectureReport));
                     report.UpState = BLL.Const.UpState_2;
-                    report.FillingMan = this.CurrUser.UserName;
+                    report.FillingMan = this.CurrUser.PersonName;
                     BLL.ArchitectureReportService.AddArchitectureReport(report);
                     BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnAdd);
                 }
@@ -1434,7 +1434,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// <returns></returns>
         private void GetButtonPower()
         {
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ArchitectureReportMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ArchitectureReportMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnSave))
@@ -1472,9 +1472,9 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     newArchitectureReport.UnitId = this.drpUnit.SelectedValue;
                     newArchitectureReport.Year = Convert.ToInt32(this.drpYear.SelectedValue);
                     newArchitectureReport.Quarters = Convert.ToInt32(this.drpQuarters.SelectedValue);
-                    newArchitectureReport.FillingMan = this.CurrUser.UserName;
+                    newArchitectureReport.FillingMan = this.CurrUser.PersonName;
                     newArchitectureReport.FillingDate = DateTime.Now;
-                    newArchitectureReport.DutyPerson = this.CurrUser.UserName;
+                    newArchitectureReport.DutyPerson = this.CurrUser.PersonName;
                     newArchitectureReport.UpState = BLL.Const.UpState_2;
                     BLL.ArchitectureReportService.AddArchitectureReport(newArchitectureReport);
 
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
index 9c54e727..42cde8e7 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
@@ -104,7 +104,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     drpMonth.SelectedValue = months;
                     drpYear.SelectedValue = year;
                     txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
-                    txtDutyPerson.Text = this.CurrUser.UserName;
+                    txtDutyPerson.Text = this.CurrUser.PersonName;
                     //增加明细集合
                     GetNewItems(year, months);
                     this.Grid1.DataSource = items;
@@ -1841,7 +1841,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 {
                     report.ChemicalReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ChemicalReport));
                     report.UpState = BLL.Const.UpState_2;
-                    report.FillingMan = this.CurrUser.UserName;
+                    report.FillingMan = this.CurrUser.PersonName;
                     BLL.ChemicalReportService.AddChemicalReport(report);
                     BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ChemicalReportId, BLL.Const.ProjectChemicalReportMenuId, BLL.Const.BtnAdd);
                 }
@@ -2056,7 +2056,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// <returns></returns>
         private void GetButtonPower()
         {
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectChemicalReportMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ProjectChemicalReportMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnSave))
@@ -2094,9 +2094,9 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     newChemicalReport.UnitId = this.drpUnit.SelectedValue;
                     newChemicalReport.Year = Convert.ToInt32(this.drpYear.SelectedValue);
                     newChemicalReport.Month = Convert.ToInt32(this.drpMonth.SelectedValue);
-                    newChemicalReport.FillingMan = this.CurrUser.UserName;
+                    newChemicalReport.FillingMan = this.CurrUser.PersonName;
                     newChemicalReport.FillingDate = DateTime.Now;
-                    newChemicalReport.DutyPerson = this.CurrUser.UserName;
+                    newChemicalReport.DutyPerson = this.CurrUser.PersonName;
                     newChemicalReport.UpState = BLL.Const.UpState_2;
                     BLL.ChemicalReportService.AddChemicalReport(newChemicalReport);