修改页面查询权限

SiteCore/Handler/sync.order.cs

@@ -4643,6 +4643,15 @@ namespace SiteCore.Handler
             {
                 lw.Add(string.Format("SupplierId in ({0})", CurrentUser.User.pemVend));
             }
+            else
+            {
+                if (posTag != "wxDesigner" && posTag != "Designer" && posTag != "DesignerMr" && posTag != "wxDesignerMr" && posTag != "SysAdmin")
+                {
+                    string usershop = CurrentUser.User.pemShop;
+                    lw.Add(string.Format("ShopId in ({0})", usershop));
+                }
+
+            }
 
             lw.Add(string.Format("OrderState = 6 and (CONVERT(VARCHAR,attachments) = '' or attachments is null)"));
             lw.Add(string.Format("type != 'PDD' "));
@@ -4715,6 +4724,15 @@ namespace SiteCore.Handler
             {
                 lw.Add(string.Format("SupplierId in ({0})", CurrentUser.User.pemVend));
             }
+            else
+            {
+                if (posTag != "wxDesigner" && posTag != "Designer" && posTag != "DesignerMr" && posTag != "wxDesignerMr" && posTag != "SysAdmin")
+                {
+                    string usershop = CurrentUser.User.pemShop;
+                    lw.Add(string.Format("ShopId in ({0})", usershop));
+                }
+
+            }
 
             lw.Add(string.Format("OrderState = 6 and (CONVERT(VARCHAR,attachments) != '' and attachments is not null) "));
             lw.Add(string.Format("(IsXianHuo=0 or (IsXianHuo=1 and IsReturn=0)) "));
@@ -4808,6 +4826,15 @@ namespace SiteCore.Handler
             {
                 lw.Add(string.Format("SupplierId in ({0})", CurrentUser.User.pemVend));
             }
+            else
+            {
+                if (posTag != "wxDesigner" && posTag != "Designer" && posTag != "DesignerMr" && posTag != "wxDesignerMr" && posTag != "SysAdmin")
+                {
+                    string usershop = CurrentUser.User.pemShop;
+                    lw.Add(string.Format("ShopId in ({0})", usershop));
+                }
+
+            }
 
             lw.Add(string.Format("OrderState = 6 and (CONVERT(VARCHAR,attachments) = '' or attachments is null)"));
             lw.Add(string.Format("type = 'PDD' "));
@@ -5121,7 +5148,20 @@ namespace SiteCore.Handler
 
             string backtype = GetPostString("backtype");
             if (backtype.Length > 0) lw.Add(string.Format("IsReturn={0}", Convert.ToInt32(backtype)));
+            string posTag = CurrentUser.UserPost.Post.Code;
+            if (posTag == "Supplier")
+            {
+                lw.Add(string.Format("SupplierId in ({0})", CurrentUser.User.pemVend));
+            }
+            else
+            {
+                if (posTag != "wxDesigner" && posTag != "Designer" && posTag != "DesignerMr" && posTag != "wxDesignerMr" && posTag != "SysAdmin")
+                {
+                    string usershop = CurrentUser.User.pemShop;
+                    lw.Add(string.Format("ShopId in ({0})", usershop));
+                }
 
+            }
 
             dStruct.Order = "FinishDesignTime desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
@@ -5594,6 +5634,12 @@ namespace SiteCore.Handler
             {
                 string supplier = GetPostString("supplier");
                 if (supplier.Length > 0) lw.Add(string.Format("SupplierName like '%{0}%'", supplier));
+                if (posTag != "wxDesigner" && posTag != "Designer" && posTag != "DesignerMr" && posTag != "wxDesignerMr" && posTag != "SysAdmin")
+                {
+                    string usershop = CurrentUser.User.pemShop;
+                    lw.Add(string.Format("ShopId in ({0})", usershop));
+                }
+
             }
             lw.Add(string.Format(" OrderState IN (7, 8)"));
             lw.Add(string.Format("type != 'PDD' "));
@@ -5699,6 +5745,12 @@ namespace SiteCore.Handler
             }
             else
             {
+                if (posTag != "wxDesigner" && posTag != "Designer" && posTag != "DesignerMr" && posTag != "wxDesignerMr" && posTag != "SysAdmin")
+                {
+                    string usershop = CurrentUser.User.pemShop;
+                    lw.Add(string.Format("ShopId in ({0})", usershop));
+                }
+
                 string supplier = GetPostString("supplier");
                 if (supplier.Length > 0) lw.Add(string.Format("SupplierName like '%{0}%'", supplier));
             }

SiteCore/taobao/commonHelper.cs

@@ -3675,7 +3675,7 @@ namespace SiteCore
                 return result;
             }
             string[] memolist = memo.Split('-');
-            if(memolist.Length < 3)
+            if (memolist.Length < 3)
             {
                 return result;
             }
@@ -3690,7 +3690,9 @@ namespace SiteCore
             }
             if (!result)
             {
-                if (size_text.Count(c => c == 'x') > 1)
+                int a = size_text.Split(new string[] { "mm" }, StringSplitOptions.None).Length - 1;
+                a += size_text.Split(new string[] { "cm" }, StringSplitOptions.None).Length - 1;
+                if (size_text.Count(c => c == 'x') > 1 && a > 1)
                 {
                     result = true;
                 }