'20220826-3'

2 years ago · 8d6913f00a
parent a51ef4c9c2
commit 8d6913f00a
11 changed files with 44 additions and 19 deletions
--- a/BookingJieFeng/BookingJieFeng.csproj.user
+++ b/BookingJieFeng/BookingJieFeng.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
  </PropertyGroup>
  <ProjectExtensions>
--- a/BookingJieFeng/obj/Debug/BookingJieFeng.csproj.AssemblyReference.cache
+++ b/BookingJieFeng/obj/Debug/BookingJieFeng.csproj.AssemblyReference.cache
--- a/BookingWeb/BookingWeb.csproj.user
+++ b/BookingWeb/BookingWeb.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
--- a/BookingWeb/obj/Debug/BookingWeb.csproj.AssemblyReference.cache
+++ b/BookingWeb/obj/Debug/BookingWeb.csproj.AssemblyReference.cache
--- a/DSWeb.Common/DB/Comm.cs
+++ b/DSWeb.Common/DB/Comm.cs
@ -1276,7 +1276,7 @@ namespace DSWeb.Common.DB

        
        public string USERID { get; set; }
-
+        public string ISSALEMAN { get; set; }
        
        //public string WeChatAccount { get; set; }

--- a/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsInfoClient/MsInfoClientDAL.cs
@ -1542,8 +1542,32 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient


        #region 权限范围
+
+        /// <summary>
+        /// 该算法改为只限制销售
+        /// 
+        /// </summary>
+        /// <param name="tb"></param>
+        /// <param name="userid"></param>
+        /// <param name="username"></param>
+        /// <param name="companyid"></param>
+        /// <returns></returns>
        public static string GetRangDAStr(string tb, string userid, string username, string companyid)
        {
+            string str = " ISNULL(BLSTATUS,1)=0 and RANGETYPE='集团' ";
+
+
+            var cdc = new CommonDataContext();
+            var userinfo = cdc.VW_user.FirstOrDefault(x => x.USERID == userid);
+
+            if (userinfo == null) return (" 1=2 ");
+            if (userinfo != null && userinfo.ISSALEMAN== "true") {
+                //是销售 看不到录入人 不是自己且不为空的 Rangetype=个人 的往来单位
+                str += " and (RANGETYPE='个人' and in)"
+            }
+
+            return str;
+            /*
            string str = "";
            var strSql = new StringBuilder();
            strSql.Append("SELECT ");
@ -1644,6 +1668,7 @@ namespace DSWeb.MvcShipping.DAL.MsInfoClient
            }

            return str;
+            */
        }
        #endregion

--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@ -4,7 +4,7 @@
    <ProjectView>ShowAllFiles</ProjectView>
    <NameOfLastUsedPublishProfile>E:\DS7GIT\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />
--- a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
@ -389,16 +389,16 @@
      <publishTime>08/26/2022 15:18:29</publishTime>
    </File>
    <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_Audit.js">
-      <publishTime>08/26/2022 15:18:29</publishTime>
+      <publishTime>08/26/2022 17:36:20</publishTime>
    </File>
    <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js">
-      <publishTime>08/26/2022 15:18:29</publishTime>
+      <publishTime>08/26/2022 17:36:20</publishTime>
    </File>
    <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditLR.js">
-      <publishTime>08/26/2022 15:18:29</publishTime>
+      <publishTime>08/26/2022 17:36:20</publishTime>
    </File>
    <File Include="Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditTruck.js">
-      <publishTime>08/26/2022 15:18:29</publishTime>
+      <publishTime>08/26/2022 17:36:20</publishTime>
    </File>
    <File Include="Areas/Account/Viewsjs/Chfee_Audit/Index.js">
      <publishTime>08/26/2022 14:59:28</publishTime>
@ -3479,7 +3479,7 @@
      <publishTime>08/26/2022 15:18:30</publishTime>
    </File>
    <File Include="Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCtnChfee_Audit.js">
-      <publishTime>08/26/2022 15:18:30</publishTime>
+      <publishTime>08/26/2022 17:36:15</publishTime>
    </File>
    <File Include="Areas/MvcContainer/Viewsjs/MsOpCtnBsCard/MsOpCtnBsCtnStatusEdit.js">
      <publishTime>08/26/2022 15:18:30</publishTime>
@ -6704,7 +6704,7 @@
      <publishTime>08/26/2022 14:59:30</publishTime>
    </File>
    <File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientEdit.js">
-      <publishTime>08/26/2022 15:18:30</publishTime>
+      <publishTime>08/26/2022 17:52:01</publishTime>
    </File>
    <File Include="Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientHangXinCustIndex.js">
      <publishTime>08/26/2022 14:59:30</publishTime>
@ -12821,10 +12821,10 @@
      <publishTime>08/26/2022 14:59:24</publishTime>
    </File>
    <File Include="bin/App_global.asax.compiled">
-      <publishTime>08/26/2022 16:55:25</publishTime>
+      <publishTime>08/26/2022 18:15:05</publishTime>
    </File>
    <File Include="bin/App_global.asax.dll">
-      <publishTime>08/26/2022 16:55:25</publishTime>
+      <publishTime>08/26/2022 18:15:05</publishTime>
    </File>
    <File Include="bin/AspNetPager.dll">
      <publishTime>08/26/2022 14:59:36</publishTime>
@ -12884,19 +12884,19 @@
      <publishTime>08/26/2022 16:54:15</publishTime>
    </File>
    <File Include="bin/DSWeb.dll">
-      <publishTime>08/26/2022 16:54:48</publishTime>
+      <publishTime>08/26/2022 18:14:48</publishTime>
    </File>
    <File Include="bin/DSWeb.Interface.dll">
-      <publishTime>08/26/2022 16:54:17</publishTime>
+      <publishTime>08/26/2022 18:14:15</publishTime>
    </File>
    <File Include="bin/DSWeb.Interface.pdb">
-      <publishTime>08/26/2022 16:54:17</publishTime>
+      <publishTime>08/26/2022 18:14:15</publishTime>
    </File>
    <File Include="bin/DSWeb.pdb">
-      <publishTime>08/26/2022 16:54:48</publishTime>
+      <publishTime>08/26/2022 18:14:48</publishTime>
    </File>
    <File Include="bin/DSWeb.XmlSerializers.dll">
-      <publishTime>08/26/2022 16:54:49</publishTime>
+      <publishTime>08/26/2022 18:14:49</publishTime>
    </File>
    <File Include="bin/DSWebComponent.dll">
      <publishTime>08/26/2022 16:54:15</publishTime>
@ -17528,7 +17528,7 @@
      <publishTime>08/26/2022 14:59:33</publishTime>
    </File>
    <File Include="PrecompiledApp.config">
-      <publishTime>08/26/2022 16:55:19</publishTime>
+      <publishTime>08/26/2022 18:14:58</publishTime>
    </File>
    <File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
      <publishTime>08/26/2022 14:59:33</publishTime>
--- a/DSWeb/bin/DSWeb.XmlSerializers.dll
+++ b/DSWeb/bin/DSWeb.XmlSerializers.dll
--- a/DispatchWeb/DispatchWeb.csproj.user
+++ b/DispatchWeb/DispatchWeb.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
--- a/DispatchWeb/obj/Debug/DispatchWeb.csproj.AssemblyReference.cache
+++ b/DispatchWeb/obj/Debug/DispatchWeb.csproj.AssemblyReference.cache