From 1b9a56fcf3ffcf0f69ed8b7447322d0a75ba99ac Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期四, 02 三月 2023 15:31:14 +0800 Subject: [PATCH] 清理dataAccess,避免报错 --- web/web/Bin/Dao.dll | 0 web/Dao/bin/Release/Dao.pdb | 0 web/.vs/Web/v17/.suo | 0 web/Dao/bin/Release/Dao.dll | 0 web/web/GwTransfer.ashx | 1 - web/Dao/Dao.csproj | 2 +- web/web/Bin/Common.dll | 0 web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx | 0 web/Lib/Model.dll | 0 web/web/Bin/App_Code.pdb | 0 web/Dao/bin/Release/Model.dll | 0 web/.vs/Web/config/applicationhost.config | 2 +- web/web/Bin/Dao.pdb | 0 web/web/GwClientSub.aspx | 3 ++- web/web/Bin/App_Code.dll | 0 web/web/Bin/UMCLib.pdb | 0 web/Dao/bin/Release/Common.dll | 0 web/web/Bin/Common.pdb | 0 web/Lib/Common.dll | 0 web/Lib/UMCLib.dll | 0 web/Web.sln | 2 +- web/web/ExportDocument.aspx.cs | 4 +++- web/Lib/Model.pdb | 0 web/Dao/bin/Release/Model.pdb | 0 web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx | 0 web/.vs/Web/FileContentIndex/dc428d8c-5b83-4e50-a072-d4c3105f76ab.vsidx | 0 web/Dao/GwClientDao.cs | 20 ++++++++++++++++++-- web/Lib/Dao.dll | 0 web/web/Index.aspx | 2 +- /dev/null | 0 web/web/GwClient.ashx | 4 +++- web/Lib/Common.pdb | 0 web/web/Bin/Model.pdb | 0 web/.vs/Web/FileContentIndex/35892b4e-5b0f-443d-8ced-4605fd70028a.vsidx | 0 web/Dao/bin/Release/Common.pdb | 0 web/web/GwClient.aspx | 4 ---- web/web/Bin/Model.dll | 0 web/Lib/Dao.pdb | 0 web/web/website.publishproj | 12 ------------ web/Lib/App_Code.dll | 0 40 files changed, 30 insertions(+), 26 deletions(-) diff --git a/web/.vs/Web/FileContentIndex/0419d2ad-ced8-4447-bad9-7b5701b335d8.vsidx b/web/.vs/Web/FileContentIndex/0419d2ad-ced8-4447-bad9-7b5701b335d8.vsidx deleted file mode 100644 index b2e5031..0000000 --- a/web/.vs/Web/FileContentIndex/0419d2ad-ced8-4447-bad9-7b5701b335d8.vsidx +++ /dev/null Binary files differ diff --git a/web/.vs/Web/FileContentIndex/35892b4e-5b0f-443d-8ced-4605fd70028a.vsidx b/web/.vs/Web/FileContentIndex/35892b4e-5b0f-443d-8ced-4605fd70028a.vsidx new file mode 100644 index 0000000..905bcb6 --- /dev/null +++ b/web/.vs/Web/FileContentIndex/35892b4e-5b0f-443d-8ced-4605fd70028a.vsidx Binary files differ diff --git a/web/.vs/Web/FileContentIndex/79694cf4-4ab6-42a5-9a88-3040eca22d51.vsidx b/web/.vs/Web/FileContentIndex/79694cf4-4ab6-42a5-9a88-3040eca22d51.vsidx deleted file mode 100644 index 8b81979..0000000 --- a/web/.vs/Web/FileContentIndex/79694cf4-4ab6-42a5-9a88-3040eca22d51.vsidx +++ /dev/null Binary files differ diff --git a/web/.vs/Web/FileContentIndex/8f696eb1-6627-4ae6-821d-6d56c98f9654.vsidx b/web/.vs/Web/FileContentIndex/8f696eb1-6627-4ae6-821d-6d56c98f9654.vsidx deleted file mode 100644 index ee3d074..0000000 --- a/web/.vs/Web/FileContentIndex/8f696eb1-6627-4ae6-821d-6d56c98f9654.vsidx +++ /dev/null Binary files differ diff --git a/web/.vs/Web/FileContentIndex/7104b6c1-743e-4aa0-bd68-82beb31cfe6d.vsidx b/web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx similarity index 77% rename from web/.vs/Web/FileContentIndex/7104b6c1-743e-4aa0-bd68-82beb31cfe6d.vsidx rename to web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx index 4607b64..c85952b 100644 --- a/web/.vs/Web/FileContentIndex/7104b6c1-743e-4aa0-bd68-82beb31cfe6d.vsidx +++ b/web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx Binary files differ diff --git a/web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx b/web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx new file mode 100644 index 0000000..27ec1d3 --- /dev/null +++ b/web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx Binary files differ diff --git a/web/.vs/Web/FileContentIndex/dc428d8c-5b83-4e50-a072-d4c3105f76ab.vsidx b/web/.vs/Web/FileContentIndex/dc428d8c-5b83-4e50-a072-d4c3105f76ab.vsidx new file mode 100644 index 0000000..5d6af74 --- /dev/null +++ b/web/.vs/Web/FileContentIndex/dc428d8c-5b83-4e50-a072-d4c3105f76ab.vsidx Binary files differ diff --git a/web/.vs/Web/config/applicationhost.config b/web/.vs/Web/config/applicationhost.config index 2e2a7ca..88fe2ce 100644 --- a/web/.vs/Web/config/applicationhost.config +++ b/web/.vs/Web/config/applicationhost.config @@ -162,7 +162,7 @@ </site> <site name="web" id="2"> <application path="/" applicationPool="Clr4IntegratedAppPool"> - <virtualDirectory path="/" physicalPath="C:\Users\mac\Desktop\RDream\SMGW_NewWeb\web\web" /> + <virtualDirectory path="/" physicalPath="C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\web" /> </application> <bindings> <binding protocol="http" bindingInformation="*:60960:localhost" /> diff --git a/web/.vs/Web/v17/.suo b/web/.vs/Web/v17/.suo index d10b0cf..7e9f3e0 100644 --- a/web/.vs/Web/v17/.suo +++ b/web/.vs/Web/v17/.suo Binary files differ diff --git a/web/Common/bin/Release/Oracle.DataAccess.dll b/web/Common/bin/Release/Oracle.DataAccess.dll deleted file mode 100644 index 289bd51..0000000 --- a/web/Common/bin/Release/Oracle.DataAccess.dll +++ /dev/null Binary files differ diff --git a/web/Common/lib/Oracle.DataAccess.dll b/web/Common/lib/Oracle.DataAccess.dll deleted file mode 100644 index 289bd51..0000000 --- a/web/Common/lib/Oracle.DataAccess.dll +++ /dev/null Binary files differ diff --git a/web/Dao/Dao.csproj b/web/Dao/Dao.csproj index 1e706b6..8d7525d 100644 --- a/web/Dao/Dao.csproj +++ b/web/Dao/Dao.csproj @@ -36,7 +36,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\Lib\</OutputPath> + <OutputPath>bin\Release\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs index 4b8cc89..5753d21 100644 --- a/web/Dao/GwClientDao.cs +++ b/web/Dao/GwClientDao.cs @@ -29,7 +29,7 @@ /// <param name="productId">浜у搧ID</param> /// <returns></returns> //public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telphone, string agent) - public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telephone, string agent, string company, string salesman, string supportStaff, string productId, int isEnable, string permissionsSQL ) + public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telephone, string agent, string company, string salesman, string supportStaff, string productId, int isEnable,int isSub, string permissionsSQL ) { List<GwClient> list = new List<GwClient>(); @@ -46,7 +46,7 @@ stringBuilder.Append(" ) t on t.client_id = gwc.client_id "); //stringBuilder.Append("from GW_CLIENT where 1=1"); stringBuilder.Append(" WHERE 1=1"); - OracleParameter[] oracleParameterArray = new OracleParameter[8]; + OracleParameter[] oracleParameterArray = new OracleParameter[9]; if (clientID != null && clientID != "") { oracleParameterArray[0] = new OracleParameter(":ClientID", (OracleDbType)126); @@ -97,11 +97,27 @@ stringBuilder.Append(" and gwc.IS_ENABLE = :IS_ENABLE"); } + //鏄惁涓�绾ц处鎴枫��0涓轰竴绾� + if (isSub == 0) + { + oracleParameterArray[8] = new OracleParameter(":CLIENT_PARENTID", OracleDbType.Int32); + ((DbParameter)oracleParameterArray[8]).Value = (object)(isSub); + stringBuilder.Append(" and gwc.CLIENT_PARENTID = :CLIENT_PARENTID"); + } + else + { + oracleParameterArray[8] = new OracleParameter(":CLIENT_PARENTID", OracleDbType.Int32); + ((DbParameter)oracleParameterArray[8]).Value = (object)(isSub); + stringBuilder.Append(" and gwc.CLIENT_PARENTID != :CLIENT_PARENTID"); + } + + if (productId != null && productId != "") { stringBuilder.Append(" and gwc.CLIENT_ID IN ( SELECT distinct CLIENT_ID FROM GW_SP WHERE PRODUCT_ID = '" + productId + "' )"); } + //瀹㈡埛鏉冮檺SQL鑴氭湰 stringBuilder.Append(permissionsSQL); diff --git a/web/Dao/bin/Release/Common.dll b/web/Dao/bin/Release/Common.dll index debaf88..1f5a507 100644 --- a/web/Dao/bin/Release/Common.dll +++ b/web/Dao/bin/Release/Common.dll Binary files differ diff --git a/web/Dao/bin/Release/Common.pdb b/web/Dao/bin/Release/Common.pdb index be293b9..5c6cf82 100644 --- a/web/Dao/bin/Release/Common.pdb +++ b/web/Dao/bin/Release/Common.pdb Binary files differ diff --git a/web/Dao/bin/Release/Dao.dll b/web/Dao/bin/Release/Dao.dll index 7b8c177..54ef6c3 100644 --- a/web/Dao/bin/Release/Dao.dll +++ b/web/Dao/bin/Release/Dao.dll Binary files differ diff --git a/web/Dao/bin/Release/Dao.pdb b/web/Dao/bin/Release/Dao.pdb index 3a3a475..1652c2e 100644 --- a/web/Dao/bin/Release/Dao.pdb +++ b/web/Dao/bin/Release/Dao.pdb Binary files differ diff --git a/web/Dao/bin/Release/Model.dll b/web/Dao/bin/Release/Model.dll index 7264827..74f6747 100644 --- a/web/Dao/bin/Release/Model.dll +++ b/web/Dao/bin/Release/Model.dll Binary files differ diff --git a/web/Dao/bin/Release/Model.pdb b/web/Dao/bin/Release/Model.pdb index a844b84..d766629 100644 --- a/web/Dao/bin/Release/Model.pdb +++ b/web/Dao/bin/Release/Model.pdb Binary files differ diff --git a/web/Dao/bin/Release/Oracle.DataAccess.dll b/web/Dao/bin/Release/Oracle.DataAccess.dll deleted file mode 100644 index 289bd51..0000000 --- a/web/Dao/bin/Release/Oracle.DataAccess.dll +++ /dev/null Binary files differ diff --git a/web/Lib/App_Code.dll b/web/Lib/App_Code.dll index 815ff01..264df72 100644 --- a/web/Lib/App_Code.dll +++ b/web/Lib/App_Code.dll Binary files differ diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll index 38094bf..1f5a507 100644 --- a/web/Lib/Common.dll +++ b/web/Lib/Common.dll Binary files differ diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb index 97663e8..5c6cf82 100644 --- a/web/Lib/Common.pdb +++ b/web/Lib/Common.pdb Binary files differ diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll index 1c149ac..04560a5 100644 --- a/web/Lib/Dao.dll +++ b/web/Lib/Dao.dll Binary files differ diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb index b283ec3..9630a10 100644 --- a/web/Lib/Dao.pdb +++ b/web/Lib/Dao.pdb Binary files differ diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll index d380f8b..74f6747 100644 --- a/web/Lib/Model.dll +++ b/web/Lib/Model.dll Binary files differ diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb index 088ca1c..d766629 100644 --- a/web/Lib/Model.pdb +++ b/web/Lib/Model.pdb Binary files differ diff --git a/web/Lib/Oracle.DataAccess.dll b/web/Lib/Oracle.DataAccess.dll deleted file mode 100644 index 289bd51..0000000 --- a/web/Lib/Oracle.DataAccess.dll +++ /dev/null Binary files differ diff --git a/web/Lib/UMCLib.dll b/web/Lib/UMCLib.dll index de922c5..ff86427 100644 --- a/web/Lib/UMCLib.dll +++ b/web/Lib/UMCLib.dll Binary files differ diff --git a/web/Model/bin/Release/Oracle.DataAccess.dll b/web/Model/bin/Release/Oracle.DataAccess.dll deleted file mode 100644 index 289bd51..0000000 --- a/web/Model/bin/Release/Oracle.DataAccess.dll +++ /dev/null Binary files differ diff --git a/web/Web.sln b/web/Web.sln index db24bb6..0b088f0 100644 --- a/web/Web.sln +++ b/web/Web.sln @@ -13,7 +13,7 @@ EndProjectSection ProjectSection(WebsiteProperties) = preProject TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" - ProjectReferences = "" + ProjectReferences = "{6199dc29-d043-41b0-bdfd-afa19adc7848}|App_Code.dll;{d0cdbf9c-d79a-434f-adb0-0a58b7b5e1d6}|Dao.dll;{337CD576-BA09-4182-9FDD-8F1AB1B30624}|Model.dll;" Debug.AspNetCompiler.VirtualPath = "/Web" Debug.AspNetCompiler.PhysicalPath = "Web\" Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Web\" diff --git a/web/web/Bin/App_Code.dll b/web/web/Bin/App_Code.dll index 815ff01..264df72 100644 --- a/web/web/Bin/App_Code.dll +++ b/web/web/Bin/App_Code.dll Binary files differ diff --git a/web/web/Bin/App_Code.pdb b/web/web/Bin/App_Code.pdb index 568a082..adaf7a1 100644 --- a/web/web/Bin/App_Code.pdb +++ b/web/web/Bin/App_Code.pdb Binary files differ diff --git a/web/web/Bin/Common.dll b/web/web/Bin/Common.dll index 38094bf..1f5a507 100644 --- a/web/web/Bin/Common.dll +++ b/web/web/Bin/Common.dll Binary files differ diff --git a/web/web/Bin/Common.pdb b/web/web/Bin/Common.pdb index 97663e8..5c6cf82 100644 --- a/web/web/Bin/Common.pdb +++ b/web/web/Bin/Common.pdb Binary files differ diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll index 1c149ac..54ef6c3 100644 --- a/web/web/Bin/Dao.dll +++ b/web/web/Bin/Dao.dll Binary files differ diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb index b283ec3..1652c2e 100644 --- a/web/web/Bin/Dao.pdb +++ b/web/web/Bin/Dao.pdb Binary files differ diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll index d380f8b..74f6747 100644 --- a/web/web/Bin/Model.dll +++ b/web/web/Bin/Model.dll Binary files differ diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb index 088ca1c..d766629 100644 --- a/web/web/Bin/Model.pdb +++ b/web/web/Bin/Model.pdb Binary files differ diff --git a/web/web/Bin/UMCLib.pdb b/web/web/Bin/UMCLib.pdb index 287f30a..4d95193 100644 --- a/web/web/Bin/UMCLib.pdb +++ b/web/web/Bin/UMCLib.pdb Binary files differ diff --git a/web/web/ExportDocument.aspx.cs b/web/web/ExportDocument.aspx.cs index 213dc99..7b83517 100644 --- a/web/web/ExportDocument.aspx.cs +++ b/web/web/ExportDocument.aspx.cs @@ -365,11 +365,13 @@ int recordCount = 0; int pageSize = this.AppContext.GetInt("pageSize", 999999999); + int isSub = AppContext.GetInt("isSub",0); + string str = ""; using (GwClientDao dao = new GwClientDao()) { string permissionsSQL = dao.GetClientPermissions(_userId, _userType, "gwc"); - var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable, permissionsSQL); + var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable,isSub, permissionsSQL); if (recordCount> 1000000) { this.Response.Write("<script type='text/javascript'>alert('瀵煎嚭鏁版嵁涓嶈兘澶т簬100涓囨潯锛�');location.href='GwClient.aspx?IsEnable=" + IsEnable + "';</script>"); diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx index 8e59192..ebb9d56 100644 --- a/web/web/GwClient.ashx +++ b/web/web/GwClient.ashx @@ -117,11 +117,13 @@ string serverIp = ConfigurationManager.AppSettings["serverIp"]; string clientPort = ConfigurationManager.AppSettings["clientPort"]; + int isSub = context.GetInt("isSub",0); + string str = ""; using (GwClientDao dao = new GwClientDao()) { string permissionsSQL = dao.GetClientPermissions(_userId, _userType, "gwc"); - var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable, permissionsSQL); + var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable,isSub, permissionsSQL); if (list != null && list.Count > 0) { diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx index b9deaa8..7f4c73d 100644 --- a/web/web/GwClient.aspx +++ b/web/web/GwClient.aspx @@ -254,10 +254,6 @@ } } }); - - //swal.close(); - //} - //}); } }); diff --git a/web/web/GwClientSub.aspx b/web/web/GwClientSub.aspx index e1b1cf0..8f094f8 100644 --- a/web/web/GwClientSub.aspx +++ b/web/web/GwClientSub.aspx @@ -349,10 +349,11 @@ var SupportStaff = $("#SupportStaff").val(); var ProductId = $("#ProductId").val(); var IsEnable = <%=IsEnable%>; + let isSub = 1; $.ajax({ url: "GwClient.ashx", type: "POST", - data: { action: "loadGwClientPageList", ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId, IsEnable: IsEnable , pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") }, + data: { action: "loadGwClientPageList", isSub: isSub, ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId, IsEnable: IsEnable, pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") }, success: function (result) { if (result.OK) { $("#gwclientTable tbody").html(result.Message.Table); diff --git a/web/web/GwTransfer.ashx b/web/web/GwTransfer.ashx index 1b90469..fb0e3c2 100644 --- a/web/web/GwTransfer.ashx +++ b/web/web/GwTransfer.ashx @@ -2,7 +2,6 @@ using System; using System.Web; -//using com.softwee.smgw.common; using Dao; using Model; using System.Collections.Generic; diff --git a/web/web/Index.aspx b/web/web/Index.aspx index 5f3d706..bb6bcda 100644 --- a/web/web/Index.aspx +++ b/web/web/Index.aspx @@ -145,7 +145,7 @@ <a href="#"><i class="fa fa-user-secret"></i><span class="nav-label">瀹㈡埛绠$悊 </span><span class="fa arrow"></span></a> <ul class="nav nav-second-level"> <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">瀹㈡埛淇℃伅绠$悊</a> </li> - <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">鍒嗛攢鍟嗕笅绾у鎴蜂俊鎭鐞�</a> </li> + <li><a href="GwClientSub.aspx?IsEnable=1" class="J_menuItem">鍒嗛攢鍟嗕笅绾у鎴蜂俊鎭鐞�</a> </li> <li><a href="GwClient.aspx?IsEnable=0" class="J_menuItem">鍋滅敤瀹㈡埛淇℃伅绠$悊</a> </li> <li><a href="GwSp.aspx" class="J_menuItem">鐭俊璐﹀彿绠$悊</a> </li> diff --git a/web/web/website.publishproj b/web/web/website.publishproj index b589a6f..2b37251 100644 --- a/web/web/website.publishproj +++ b/web/web/website.publishproj @@ -48,18 +48,6 @@ <Project>{6199DC29-D043-41B0-BDFD-AFA19ADC7848}</Project> <Name>App_Code</Name> </ProjectReference> - <ProjectReference Include="..\Dao\Dao.csproj"> - <Project>{D0CDBF9C-D79A-434F-ADB0-0A58B7B5E1D6}</Project> - <Name>Dao</Name> - </ProjectReference> - <ProjectReference Include="..\Model\Model.csproj"> - <Project>{337CD576-BA09-4182-9FDD-8F1AB1B30624}</Project> - <Name>Model</Name> - </ProjectReference> - <ProjectReference Include="..\UMCLib\UMCLib.csproj"> - <Project>{AA804FAB-0293-4EB3-BF43-8103F1CC93F5}</Project> - <Name>UMCLib</Name> - </ProjectReference> </ItemGroup> <Import Project="$(_WebPublishTargetsPath)\Web\Microsoft.WebSite.Publishing.targets" /> </Project> \ No newline at end of file -- Gitblit v1.9.1