Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/caimei365/commodity/components/SearchOpenService.java

@@ -358,7 +358,7 @@ public class SearchOpenService {
             thisFilter += "p_valid=2 AND p_type=1";
         } else if (2 == identity) {
             // 会员机构
-            thisFilter += "(p_visibility=1 OR p_visibility=2 OR p_visibility=3) ANDp_valid=2 AND p_type=1";
+            thisFilter += "(p_visibility=1 OR p_visibility=2 OR p_visibility=3) AND p_valid=2 AND p_type=1";
         } else if (4 == identity) {
             // 普通机构
             thisFilter += "(p_visibility=2 OR p_visibility=3) AND p_valid=2 AND p_type=1";
@@ -367,7 +367,6 @@ public class SearchOpenService {
             thisFilter += "p_visibility=3 AND p_valid=2 AND p_type=1";
         }
         searchParams.setFilter(thisFilter);
-
         // 创建sort对象，SCROLL查询只能1个排序项
         Sort sorter = new Sort();
         // 价格，销量，人气 排序（按最近30天内）