采购询价已报价搜索过滤条件更新

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

@@ -305,20 +305,16 @@ public class PurcInquiryController {
             pageInfo.filter("overdue", Constant.NO);
             pageInfo.filter("decideStatus", Status.UNAUDIT.value());
             SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-            SearchFilter distribute = userService.distribute();
-            if (distribute != null && distribute.getDistribute() == null) {
-                return null;
-            }
-            if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-                filter.setDistribute(distribute.getDistribute());
-            }
-            return detailService.findByPageInfo(pageInfo, null, filter);
+            return detailService.findByPageInfo(pageInfo, keyword, filter);
         } else {
             com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
             // 当前登录企业作为供应商
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
-            pageParams.getFilters().put("id_decidestatus", Status.REPLIED.value());
+            pageParams.getFilters().put("id_decidestatus", Status.UNAUDIT.value());
+			HashMap<String, Object> map = new HashMap<>();
+			map.put("id_invalid", Constant.YES);
+			pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);