filter bugfix

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

@@ -248,7 +248,7 @@ public class SearchOpenService {
             thisFilter += "p_valid=2 AND p_type=1";
         } else if (identity == 2) {
             // 会员机构
-            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 (identity == 4) {
             // 普通机构
             thisFilter += "(p_visibility=2 OR p_visibility=3) AND p_valid=2 AND p_type=1";

src/main/java/com/caimei365/commodity/service/impl/SearchProductServiceImpl.java

@@ -282,7 +282,7 @@ public class SearchProductServiceImpl implements SearchProductService {
         }
         SearchParams searchParams = searchOpenService.getScrollProductParams(queryStr, identity, requestPageSize, sortField, sortType);
         String thisFilter = searchParams.getFilter();
-        if (StringUtils.isNotEmpty(String.valueOf(filter))) {
+        if (StringUtils.isNotEmpty(filter)) {
             thisFilter = thisFilter + " AND " + filter;
         }
         searchParams.setFilter(thisFilter);