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

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

@@ -552,9 +552,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 
 	@Override
 	public List<InquiryMessage> getMessageList() {
-		String sql = "select p.id_id id,p.id_prid productId from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
+		String sql = "select * from (select p.id_id id,p.id_prid productId from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
 				+ SystemSession.getUser().getEnterprise().getUu()
-				+ "and i.in_enddate > trunc(sysdate)+1 and rownum <=5 order by id_id desc";
+				+ "and i.in_enddate > trunc(sysdate)  order by id_id desc) where rownum < 6";
 		List<PurcInquiryItem> items = commonDao.query(sql, PurcInquiryItem.class);
 		List<InquiryMessage> messages = new ArrayList<InquiryMessage>();
 		if (!CollectionUtils.isEmpty(items)) {