供应商产品库搜索调整

src/main/java/com/uas/platform/b2b/controller/ProductController.java

@@ -7,6 +7,7 @@ import com.uas.platform.b2b.model.ProductMatchResult;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.b2b.support.JxlsExcelView;
+import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.UpdateByBatchParameter;
@@ -20,9 +21,14 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import java.util.Map;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -89,6 +95,18 @@ public class ProductController {
 	public SPage<Product> getVendorProducts(PageParams params, Long vendUU, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		if (vendUU != null && vendUU != 0) {
+            if (StringUtils.isEmpty(keyword)) {
+                PageInfo pageInfo = new PageInfo(params);
+                Map<String, Object> mapFilter = new HashedMap();
+                mapFilter.put("enUU", vendUU);
+                mapFilter.put("isSale", Constant.YES);
+
+                pageInfo.setSort(new org.springframework.data.domain.Sort(Direction.ASC, "id"));
+                pageInfo.setFilters(mapFilter);
+                Page<Product> productPage = productService.findAllByPageInfo(pageInfo, keyword);
+                return SPageUtils.covertSPage(productPage);
+            }
+
 			pageParams.getFilters().put("pr_enuu", vendUU);
 			pageParams.getFilters().put("pr_issale", Constant.YES);
 			HashMap<String, Object> map = new HashMap<>();