Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryDetailServiceImpl.java

@@ -61,7 +61,7 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
         SimpleExpression disabled = new SimpleExpression("status", Status.DISABLED.value(), CriterionExpression.Operator.EQ, true);
         SimpleExpression[] expressions = new SimpleExpression[]{invalid, disabled};
         LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
-        pageInfo.expression(PredicateUtils.and(PredicateUtils.isNull("agreed"), PredicateUtils.or(logical, overdueAndNotReply)));
+        pageInfo.expression(PredicateUtils.or(logical, overdueAndNotReply));
         return findByPageInfo(pageInfo, keyword, filter);
 	}
 
@@ -96,17 +96,6 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
 					if (filter.getEndDate() != null)
 						pageInfo.expression(PredicateUtils.lte("inquiry.date", new Date(filter.getEndDate()), false));
 				}
-				if (StringUtils.hasText(keyword)) {
-					List<Object> lists = new ArrayList<>();
-					PageParams pageParams = new PageParams();
-					ModelMap map = new ModelMap();
-					map.put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-					pageParams.setFilters(map);
-					for (PurchaseInquiryDetail list : searchService.searchPurchaseInquiryDetailIds(keyword, pageParams).getContent()) {
-						lists.add(list.getId());
-					}
-					pageInfo.expression(PredicateUtils.in("id", lists, false));
-				}
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);