From 4af771600238be7fa403d75d3cc5a01586c6760d Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Tue, 21 Feb 2023 11:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=A5=E5=BE=AE=E8=B0=83=E6=95=B4=E5=87=A0?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84=E6=9C=AC=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs       | 6 +++---
 .../DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs       | 5 +++--
 DSWeb/Areas/Account/DAL/Chfee_hexiao/Chfee_HexiaoDAL.cs     | 5 +++--
 DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs   | 6 +++---
 .../DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs     | 6 +++---
 .../Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs     | 5 +++--
 DSWeb/DSWeb.csproj.user                                     | 4 ++--
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
index efc13ddb..cd6ae777 100644
--- a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
+++ b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
@@ -5626,9 +5626,9 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
             }
             else if (visiblerange == "1")
             {
-                str = " (v_op_bill.OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
-                + "  OR v_op_bill.DOC in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "'))";
-
+                //str = " (v_op_bill.OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
+                //+ "  OR v_op_bill.DOC in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR v_op_bill.INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "'))";
+                str = " exists (select 1 from vw_user where COMPANYID='" + companyid + "' and showname in(v_op_bill.OP,v_op_bill.SALE,v_op_bill.CUSTSERVICE,OR v_op_bill.DOC,v_op_bill.FRCUSTSERVICE,v_op_bill.INPUTBY))  ";
             }
 
             else if (visiblerange == "5")
diff --git a/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs
index f6ee2123..20c1bbc0 100644
--- a/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs
+++ b/DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs
@@ -2786,8 +2786,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
             }
             else if (visiblerange == "1")
             {
-                str = " (OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
-                + "  OR FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "'))";
+                //str = " (OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
+                //+ "  OR FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "'))";
+                str = " exists (select 1 from vw_user where COMPANYID='" + companyid + "' and showname in(OP,SALE,CUSTSERVICE,FRCUSTSERVICE,INPUTBY))  ";
             }
             else if (visiblerange == "5")
             {
diff --git a/DSWeb/Areas/Account/DAL/Chfee_hexiao/Chfee_HexiaoDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_hexiao/Chfee_HexiaoDAL.cs
index 6215cdb8..3db05364 100644
--- a/DSWeb/Areas/Account/DAL/Chfee_hexiao/Chfee_HexiaoDAL.cs
+++ b/DSWeb/Areas/Account/DAL/Chfee_hexiao/Chfee_HexiaoDAL.cs
@@ -1689,8 +1689,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Hexiao
             }
             else if (visiblerange == "1")
             {
-                str = " (OP in (select showname from vw_user where companyid='" + companyid + "') OR SALE in (select showname from vw_user where companyid='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') "
-                + "  OR FRCUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') OR INPUTBY in (select showname from vw_user where companyid='" + companyid + "'))";
+                //str = " (OP in (select showname from vw_user where companyid='" + companyid + "') OR SALE in (select showname from vw_user where companyid='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') "
+                //+ "  OR FRCUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') OR INPUTBY in (select showname from vw_user where companyid='" + companyid + "'))";
+                str = " exists (select 1 from vw_user where COMPANYID='" + companyid + "' and showname in(OP,SALE,CUSTSERVICE,FRCUSTSERVICE,INPUTBY))  ";
             }
             else if (visiblerange == "5")
             {
diff --git a/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs
index d25f89e2..8be91814 100644
--- a/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs
+++ b/DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs
@@ -4841,9 +4841,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
             }
             else if (visiblerange == "1")
             {
-                str = " (OP in (select showname from vw_user where companyid='" + companyid + "') OR SALE in (select showname from vw_user where companyid='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') "
-                 + "  OR FRCUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') OR INPUTBY in (select showname from vw_user where companyid='" + companyid + "'))";
-
+                //str = " (OP in (select showname from vw_user where companyid='" + companyid + "') OR SALE in (select showname from vw_user where companyid='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') "
+                // + "  OR FRCUSTSERVICE in (select showname from vw_user where companyid='" + companyid + "') OR INPUTBY in (select showname from vw_user where companyid='" + companyid + "'))";
+                str = " exists (select 1 from vw_user where COMPANYID='" + companyid + "' and showname in(OP,SALE,CUSTSERVICE,FRCUSTSERVICE,INPUTBY))  ";
             }
             else if (visiblerange == "5")
             {
diff --git a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs
index 41e70c07..a511c7d2 100644
--- a/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs
+++ b/DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs
@@ -4301,9 +4301,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
             }
             else if (visiblerange == "1")
             {
-                str = " (OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
-                + "  OR FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "') OR DOC in (select showname from vw_user where COMPANYID='" + companyid + "'))";
-
+                //str = " (OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
+                //+ "  OR FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "') OR DOC in (select showname from vw_user where COMPANYID='" + companyid + "'))";
+                str = " exists (select 1 from vw_user where COMPANYID='" + companyid + "' and showname in(OP,SALE,CUSTSERVICE,FRCUSTSERVICE,INPUTBY,DOC))  ";
             }
             else if (visiblerange == "5")
             {
diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs
index 8a3c28b5..2aa04307 100644
--- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs
+++ b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs
@@ -6732,8 +6732,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
             }
             else if (visiblerange == "1")
             {
-                str = " (OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
-                   + "  OR FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "'))";
+                //str = " (OP in (select showname from vw_user where COMPANYID='" + companyid + "') OR SALE in (select showname from vw_user where COMPANYID='" + companyid + "') OR CUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') "
+                //   + "  OR FRCUSTSERVICE in (select showname from vw_user where COMPANYID='" + companyid + "') OR INPUTBY in (select showname from vw_user where COMPANYID='" + companyid + "'))";
+                str = " exists (select 1 from vw_user where COMPANYID='" + companyid + "' and showname in(OP,SALE,CUSTSERVICE,FRCUSTSERVICE,INPUTBY))  ";
             }
             else if (visiblerange == "5")
             {
diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user
index a8615099..a0e4fe14 100644
--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>H:\DS7_dev\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
@@ -32,7 +32,7 @@
           <StartWorkingDirectory>
           </StartWorkingDirectory>
           <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>