Merge remote-tracking branch 'origin/master'

DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql

@@ -29,11 +29,6 @@ update Sys_Menu set MenuName='Υ
 where MenuId='06958288-96F4-4291-909A-FFC2FC76814D'
 GO
 
---违规人员记录菜单修改为：违章作业
-update Sys_Menu set MenuName='违章作业',IsUsed=1,MenuType='Menu_HSSE_P' 
-where MenuId='16e865eb-f4b7-4192-98d4-78a3e6bcaa45'
-GO
-
 
 delete Sys_Menu WHERE MenuId = '004EE400-0000-0000-0000-E2EF9AFA6F8D' or SuperMenu='004EE400-0000-0000-0000-E2EF9AFA6F8D'
 

SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs

@@ -334,11 +334,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                 BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnAdd);
             }
             //更新三库隐患记录
-            string message = string.Empty;
-            SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message);
-            if (!string.IsNullOrWhiteSpace(message))
+            string message1 = string.Empty;
+            SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message1);
+            if (!string.IsNullOrWhiteSpace(message1))
             {
-                ShowNotify(message, MessageBoxIcon.Warning);
+                ShowNotify(message1, MessageBoxIcon.Warning);
             }
             //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
             if (isClosed)