20210907

2021-09-07 11:10:20 +08:00
parent 8add136b66
commit 5ccec3cd9f
9 changed files with 186 additions and 119 deletions
@@ -428,16 +428,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                    {
                        string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                        Model.HSSE_Hazard_HazardRegister hazardRegister = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(rowID);
-                        if (hazardRegister.States == "1" || this.CurrUser.UserId == BLL.Const.sysglyId)   //待整改
-                        {
-                            BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
-                            BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
-                        }
-                        else
-                        {
-                            Alert.ShowInTop("已进入整改流程，无法删除！", MessageBoxIcon.Warning);
-                            return;
-                        }
+                        BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
+                        BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
                    }
                    BindGrid();
                    ShowNotify("删除成功!", MessageBoxIcon.Success);