'20221209-2'

2 years ago · e9acd90d00
parent 06e0811d5a
commit e9acd90d00
10 changed files with 10 additions and 10 deletions
--- a/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs
@ -1586,7 +1586,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient
                //20220901 又改成 如果查询者是销售 则受用户权限控制
                //strSql.Append($" and ((RANGETYPE='个人' and (SHORTNAME in (SELECT SHORTNAME from info_client_range where USERID='" + userid + "' )) ) or RANGETYPE='集团' ) ");
                //str = $" (RANGETYPE='集团' or (RANGETYPE='个人' and (SHORTNAME in (SELECT SHORTNAME from info_client_range where USERID='" + userid + "' ))))";
-                str = $" ((RANGETYPE = '个人' and exists(select 1 from info_client_range where info_client_range.SHORTNAME = info_Client.SHORTNAME and USERID = '" + userid + "')) or RANGETYPE = '集团' )";
+                str = $" ((RANGETYPE = '个人' and exists(select 1 from info_client_range where info_client_range.SHORTNAME = info_Client.SHORTNAME and USERID = '" + userid + $"')) or (SALE='{username}') or (OPNAME='{username}') or RANGETYPE = '集团' )";
                
            }

--- a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
@ -7,7 +7,7 @@
  <PropertyGroup>
    <TimeStampOfAssociatedLegacyPublishXmlFile />
    <_PublishTargetUrl>F:\DS7Deploy</_PublishTargetUrl>
-    <History>True|2022-12-09T02:04:25.9412033Z;True|2022-12-08T19:29:21.7615296+08:00;True|2022-12-02T14:53:38.5919068+08:00;True|2022-11-29T11:42:53.9344715+08:00;True|2022-11-28T11:05:21.6324436+08:00;True|2022-11-25T18:01:24.8470329+08:00;True|2022-11-22T18:01:09.4753450+08:00;True|2022-11-07T14:04:17.2702537+08:00;True|2022-11-02T17:24:50.7109335+08:00;True|2022-10-28T11:32:44.9685021+08:00;True|2022-10-17T15:28:15.6044058+08:00;True|2022-10-09T10:19:46.2980229+08:00;True|2022-09-30T17:35:06.7888422+08:00;True|2022-09-28T15:09:31.3794587+08:00;True|2022-09-26T17:38:31.7822040+08:00;True|2022-09-23T10:50:12.4477513+08:00;True|2022-09-20T11:43:07.7861580+08:00;True|2022-09-19T17:29:15.0054651+08:00;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
+    <History>True|2022-12-09T10:43:11.7096643Z;True|2022-12-09T10:04:25.9412033+08:00;True|2022-12-08T19:29:21.7615296+08:00;True|2022-12-02T14:53:38.5919068+08:00;True|2022-11-29T11:42:53.9344715+08:00;True|2022-11-28T11:05:21.6324436+08:00;True|2022-11-25T18:01:24.8470329+08:00;True|2022-11-22T18:01:09.4753450+08:00;True|2022-11-07T14:04:17.2702537+08:00;True|2022-11-02T17:24:50.7109335+08:00;True|2022-10-28T11:32:44.9685021+08:00;True|2022-10-17T15:28:15.6044058+08:00;True|2022-10-09T10:19:46.2980229+08:00;True|2022-09-30T17:35:06.7888422+08:00;True|2022-09-28T15:09:31.3794587+08:00;True|2022-09-26T17:38:31.7822040+08:00;True|2022-09-23T10:50:12.4477513+08:00;True|2022-09-20T11:43:07.7861580+08:00;True|2022-09-19T17:29:15.0054651+08:00;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
  <ItemGroup>
@ -12843,10 +12843,10 @@
      <publishTime>08/26/2022 20:26:37</publishTime>
    </File>
    <File Include="bin/App_global.asax.compiled">
-      <publishTime>12/09/2022 16:28:39</publishTime>
+      <publishTime>12/09/2022 18:42:11</publishTime>
    </File>
    <File Include="bin/App_global.asax.dll">
-      <publishTime>12/09/2022 16:28:39</publishTime>
+      <publishTime>12/09/2022 18:42:11</publishTime>
    </File>
    <File Include="bin/AspNetPager.dll">
      <publishTime>08/26/2022 20:26:48</publishTime>
@ -12906,19 +12906,19 @@
      <publishTime>12/08/2022 19:27:05</publishTime>
    </File>
    <File Include="bin/DSWeb.dll">
-      <publishTime>12/09/2022 16:28:23</publishTime>
+      <publishTime>12/09/2022 18:41:51</publishTime>
    </File>
    <File Include="bin/DSWeb.Interface.dll">
-      <publishTime>12/09/2022 16:28:10</publishTime>
+      <publishTime>12/09/2022 18:41:38</publishTime>
    </File>
    <File Include="bin/DSWeb.Interface.pdb">
-      <publishTime>12/09/2022 16:28:10</publishTime>
+      <publishTime>12/09/2022 18:41:38</publishTime>
    </File>
    <File Include="bin/DSWeb.pdb">
-      <publishTime>12/09/2022 16:28:23</publishTime>
+      <publishTime>12/09/2022 18:41:51</publishTime>
    </File>
    <File Include="bin/DSWeb.XmlSerializers.dll">
-      <publishTime>12/09/2022 16:28:24</publishTime>
+      <publishTime>12/09/2022 18:41:52</publishTime>
    </File>
    <File Include="bin/DSWebComponent.dll">
      <publishTime>12/01/2022 10:04:34</publishTime>
@ -17550,7 +17550,7 @@
      <publishTime>08/26/2022 20:26:46</publishTime>
    </File>
    <File Include="PrecompiledApp.config">
-      <publishTime>12/09/2022 16:28:34</publishTime>
+      <publishTime>12/09/2022 18:42:05</publishTime>
    </File>
    <File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
      <publishTime>08/26/2022 20:26:46</publishTime>
--- a/DSWeb/bin/DSWeb.XmlSerializers.dll
+++ b/DSWeb/bin/DSWeb.XmlSerializers.dll
--- a/DSWeb/bin/DSWebComponent.pdb
+++ b/DSWeb/bin/DSWebComponent.pdb
--- a/DSWeb/bin/JsonHelper.dll
+++ b/DSWeb/bin/JsonHelper.dll
--- a/DSWeb/bin/JsonHelper.pdb
+++ b/DSWeb/bin/JsonHelper.pdb
--- a/DSWeb/bin/OfficeHelper.dll
+++ b/DSWeb/bin/OfficeHelper.dll
--- a/DSWeb/bin/OfficeHelper.pdb
+++ b/DSWeb/bin/OfficeHelper.pdb
--- a/DSWeb/bin/WebSqlHelper.dll
+++ b/DSWeb/bin/WebSqlHelper.dll
--- a/DSWeb/bin/WebSqlHelper.pdb
+++ b/DSWeb/bin/WebSqlHelper.pdb