|
|
@@ -1013,7 +1013,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
if (size == 0 || size == null) {
|
|
|
size = 10;
|
|
|
}
|
|
|
- String sql = "select * from (select p.id_id id, p.id_prid productId, p.id_date as date, i.in_enuu enuu from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1";
|
|
|
+ String sql = "select * from (select p.id_id id, p.id_prodtitle prodTitle, p.id_date as date, i.in_enuu enuu from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where 1=1";
|
|
|
if (enuu != null) {
|
|
|
sql = sql + " and i.in_enuu <> " + enuu ;
|
|
|
}
|
|
|
@@ -1027,9 +1027,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
Enterprise enterprise = enterpriseDao.findOne(item.getEnuu());
|
|
|
message.setEnName(enterprise.getEnName());
|
|
|
}
|
|
|
- Product prod = productDao.findOne(item.getProductId());
|
|
|
- message.setPordName(prod.getTitle());
|
|
|
item = purcInquiryItemDao.findOne(item.getId());
|
|
|
+ message.setPordName(item.getProdTitle());
|
|
|
message.setInid(item.getId());
|
|
|
PublicInquiryItem publicInquiryItem = publicInquiryItemDao.findByVendUUAndSourceId(enuu, item.getId());
|
|
|
if (null != publicInquiryItem) {
|