Merge branch 'ShenZhenCHJY' of http://60.209.125.238:13080/dengyu/DS7 into ShenZhenCHJY

# Conflicts:
#	DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
#	DSWeb/bin/DSWeb.XmlSerializers.dll
#	DSWeb/bin/DSWebComponent.pdb
#	DSWeb/bin/JsonHelper.dll
#	DSWeb/bin/JsonHelper.pdb
#	DSWeb/bin/OfficeHelper.dll
#	DSWeb/bin/OfficeHelper.pdb
#	DSWeb/bin/WebSqlHelper.dll
#	DSWeb/bin/WebSqlHelper.pdb

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 = '集团' )";
                 
             }