From ce468ed018eaf7299e8fa63b9532f17bf0eb11c0 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 25 Sep 2024 22:33:20 +0800
Subject: [PATCH] =?UTF-8?q?20240925=20=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E8=BF=9D=E7=AB=A0=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FCL/FineUIPro.Web/FineUIPro.Web.csproj.user  |  2 +-
 FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs | 12 ++++++++++--
 FCL/FineUIPro.Web/Web.config                 |  2 +-
 FCL/WebApi/WebApi.csproj.user                |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
index fcf3204..accb770 100644
--- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>
     </Use64BitIISExpress>
diff --git a/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs b/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs
index 425c074..e1e658c 100644
--- a/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs
+++ b/FCL/FineUIPro.Web/SES/CQualityPunish.aspx.cs
@@ -40,9 +40,17 @@ namespace FineUIPro.Web.SES
 
         private void BindGrid()
         {
-            string strSql = @"SELECT * FROM dbo.View_EMC_Que_Punishment WHERE Flag='2'  ";
-
+            string strSql = string.Empty;
+            if (this.CurrUser.UserId == BLL.Const.GlyId)
+            {
+                strSql = @"SELECT * FROM dbo.View_EMC_Que_Punishment WHERE Flag='2'  ";
+            }
+            else
+            {
+                strSql = @"SELECT * FROM dbo.View_EMC_Que_Punishment WHERE Flag='2' AND (Requisitioner=@userId or AuditMan=@userId or Violation_Inspector=@userId or Main_CoordinatorId=@userId) ";
+            }
             List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@userId", this.CurrUser.UserId));
             if (!string.IsNullOrEmpty(this.txtFO_NO.Text.Trim()))
             {
                 strSql += " AND FO_NO LIKE @FO_NO";
diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config
index 0e9c536..0bc7abb 100644
--- a/FCL/FineUIPro.Web/Web.config
+++ b/FCL/FineUIPro.Web/Web.config
@@ -54,7 +54,7 @@
       <add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <buildProviders>
         <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
       </buildProviders>
diff --git a/FCL/WebApi/WebApi.csproj.user b/FCL/WebApi/WebApi.csproj.user
index ca0d73e..643f3e5 100644
--- a/FCL/WebApi/WebApi.csproj.user
+++ b/FCL/WebApi/WebApi.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>