Browse Source

Merge remote-tracking branch 'origin/feature-201839-wangcz' into feature-201839-wangcz

hejq 7 years ago
parent
commit
7393d1ad30

+ 2 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductPersonDao.java

@@ -66,8 +66,8 @@ public interface ProductPersonDao extends JpaRepository<ProductPerson, Long>, Jp
      * @param userUU
      * @return
      */
-    @Query("select p.productId from ProductPerson p where p.enuu = :enuu and p.userUU = :userUU")
-    List<Long> findIdByEnuuAndUserUU(@Param("enuu") Long enuu, @Param("userUU") Long userUU);
+    @Query("select p.productId from ProductPerson p where p.enuu = :enuu and p.userUU = :userUU and p.productId in (:ids)")
+    List<Long> findIdByEnuuAndUserUUAndIds(@Param("enuu") Long enuu, @Param("userUU") Long userUU, @Param("ids") List<Long> ids);
 
     /**
      * 根据userUU查找物料信息

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -319,7 +319,7 @@ public class ProductServiceImpl implements ProductService {
         List<ProductDetail> productDetails = productDetailDao.findByProductIds(idList);
         userUU = SystemSession.getUser().getUserUU();
         List<ProductAttachSubmit> productAttachSubmits = productAttachService.findByProductidsAndStatus(idList, Status.UNAUDIT.value());
-        List<Long> productIds = productPersonDao.findIdByEnuuAndUserUU(enUU, userUU);
+        List<Long> productIds = productPersonDao.findIdByEnuuAndUserUUAndIds(enUU, userUU, idList);
         List<Goods> goodsList = goodsService.findByProductids(idList);
         for (V_ProductPrivate product : productList) {
             // 设置ERP信息