Prechádzať zdrojové kódy

根据itemId和venduu查询公司商机返回数据报错处理

liusw 7 rokov pred
rodič
commit
5f6fc84fc6

+ 8 - 0
src/main/java/com/uas/ps/inquiry/dao/InquiryEnRemindDao.java

@@ -66,6 +66,14 @@ public interface InquiryEnRemindDao extends JpaRepository<InquiryEnRemind, Long>
      */
     InquiryEnRemind findByItemIdAndEnUU(Long itemId, Long enUU);
 
+    /**
+     * 通过明细id和供应商uu查询企业推荐信息
+     * @param itemId
+     * @param vendUU
+     * @return
+     */
+    List<InquiryEnRemind> findByItemIdAndVendUU(Long itemId, Long vendUU);
+
     /**
      * 通过企业uu查询企业推荐信息
      * @param vendUU

+ 3 - 2
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1109,6 +1109,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             }
         }
         Page<PurcInquiryItemInfo> orders = inquiryItemInfoDao.findAll(new Specification<PurcInquiryItemInfo>() {
+            @Override
             public Predicate toPredicate(Root<PurcInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 query.where(info.getPredicates(root, query, builder));
                 return null;
@@ -1118,8 +1119,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         if (null != filter && !StringUtils.isEmpty(enUU)) {
             for (PurcInquiryItemInfo itemInfo : orders) {
                 PublicInquiryItem item = publicInquiryItemDao.findByVendUUAndSourceId(filter.getEnUU(), itemInfo.getId());
-                InquiryEnRemind inquiryEnRemind = inquiryEnRemindDao.findByItemIdAndEnUU(itemInfo.getId(), filter.getEnUU());
-                if (!StringUtils.isEmpty(inquiryEnRemind)) {
+                List<InquiryEnRemind> inquiryEnRemind = inquiryEnRemindDao.findByItemIdAndVendUU(itemInfo.getId(), filter.getEnUU());
+                if (!CollectionUtils.isEmpty(inquiryEnRemind) && inquiryEnRemind.size() > 0) {
                     itemInfo.setAllotStatus((short) 1);
                 } else {
                     itemInfo.setAllotStatus((short) 0);