From b7b87e22404563a00c4d1d9b7307faf8e8adf61c Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Sat, 12 Oct 2024 16:22:19 +0800
Subject: [PATCH] =?UTF-8?q?20241012=20Contractor=20Quality=20Punishment?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9F=A5=E7=9C=8B=E5=85=A8=E9=83=A8=E6=9D=83?=
=?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FCL/BLL/SysManage/Sys_ButtonPowerService.cs | 25 +++++++++++++++---
FCL/FineUIPro.Web/File/Excel/CSafePunish.xlsx | Bin 0 -> 10605 bytes
FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs | 3 ++-
FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs | 2 +-
FCL/FineUIPro.Web/Web.config | 4 +--
5 files changed, 27 insertions(+), 7 deletions(-)
create mode 100644 FCL/FineUIPro.Web/File/Excel/CSafePunish.xlsx
diff --git a/FCL/BLL/SysManage/Sys_ButtonPowerService.cs b/FCL/BLL/SysManage/Sys_ButtonPowerService.cs
index 5c28400..bcbd63c 100644
--- a/FCL/BLL/SysManage/Sys_ButtonPowerService.cs
+++ b/FCL/BLL/SysManage/Sys_ButtonPowerService.cs
@@ -1,7 +1,9 @@
-using System;
+using NPOI.SS.Formula.Atp;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Web.Security;
namespace BLL
{
@@ -45,7 +47,7 @@ namespace BLL
{
var bt = from x in Funs.DB.Sys_ButtonPower
join y in Funs.DB.Sys_Menu on x.MenuId equals y.MenuId
- where x.RoleId == roleId
+ where x.RoleId == roleId
select x;
if (bt.Count() > 0)
@@ -104,8 +106,25 @@ namespace BLL
//}
//else
//{
- return false;
+ return false;
//}
}
+
+ ///
+ /// 根据用户id获取有ViewAll按钮权限用户
+ ///
+ ///
+ ///
+ public static Model.Sys_User GetButtonPowerByUserId(string userId)
+ {
+ var q = (from x in Funs.DB.Sys_User
+ join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
+ join z in Funs.DB.Sys_ButtonPower on y.RoleId equals z.RoleId
+ join w in Funs.DB.Sys_ButtonToMenu on z.ButtonToMenuId equals w.ButtonToMenuId
+ where w.ButtonEnName == "ViewAll"
+ && x.UserId == userId
+ select x).FirstOrDefault();
+ return q;
+ }
}
}
diff --git a/FCL/FineUIPro.Web/File/Excel/CSafePunish.xlsx b/FCL/FineUIPro.Web/File/Excel/CSafePunish.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..085f6d707645f17488565ef7adb78ec83249e9f6
GIT binary patch
literal 10605
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
T@?t=n#51rY(470opZ@(na=0&@
literal 0
HcmV?d00001
diff --git a/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs b/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs
index e1e658c..331980f 100644
--- a/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs
@@ -41,7 +41,8 @@ namespace FineUIPro.Web.SES
private void BindGrid()
{
string strSql = string.Empty;
- if (this.CurrUser.UserId == BLL.Const.GlyId)
+ var user = BLL.Sys_ButtonPowerService.GetButtonPowerByUserId(this.CurrUser.UserId);
+ if (this.CurrUser.UserId == BLL.Const.GlyId || user != null)
{
strSql = @"SELECT * FROM dbo.View_EMC_Que_Punishment WHERE Flag='2' ";
}
diff --git a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
index 00848de..867001a 100644
--- a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs
@@ -391,7 +391,7 @@ namespace FineUIPro.Web.SES
{
string rootPath = Server.MapPath("~/") + Const.ExcelUrl;
//模板文件
- string TempletFileName = rootPath + "Punishment.xlsx";
+ string TempletFileName = rootPath + "CSafePunish.xlsx";
//导出文件
string filePath = rootPath + DateTime.Now.ToString("yyyyMMddhhmmss") + "\\";
if (!Directory.Exists(filePath))
diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config
index f4e479f..c97a2b2 100644
--- a/FCL/FineUIPro.Web/Web.config
+++ b/FCL/FineUIPro.Web/Web.config
@@ -55,7 +55,7 @@
-
+
@@ -152,7 +152,7 @@
-
+