根据企业UU和物料原厂型号cmpCode获取个人产品库信息接口修改

src/main/java/com/uas/ps/product/entity/Prod.java

@@ -417,7 +417,6 @@ public class Prod implements Serializable {
         product.setIsPurchase(this.pr_ispurchase);
         product.setIsSale(this.pr_issale);
         product.setIsShow(this.pr_isshow);
-        product.setStandard(this.standard);
         product.setSourceApp("ERP");
         product.setErpDate(new Date());
         product.setReserve(this.pr_reserve);

src/main/java/com/uas/ps/product/repository/ProductDao.java

@@ -99,7 +99,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param cmpCode 物料原厂型号
      * @return
      */
-    @Query("select p.id from Product p where p.cmpCode = :cmpCode and p.enUU <> :enUU")
+    @Query("select p.id from Product p where p.cmpCode is not null and p.cmpCode = :cmpCode and p.enUU <> :enUU")
     List<Long> getSameProdIdsByEnUUAndCmpCode(@Param("enUU") Long enUU, @Param("cmpCode") String cmpCode);
 
     /**

src/main/java/com/uas/ps/product/service/impl/ProductUsersServiceImpl.java

@@ -212,9 +212,10 @@ public class ProductUsersServiceImpl implements ProductUsersService {
         return productUsersDao.findAll(new Specification<ProductUsers>() {
             @Override
             public Predicate toPredicate(Root<ProductUsers> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                final PredicateFactory<Product> factory = new PredicateFactory<>();
+                final PredicateFactory<ProductUsers> factory = new PredicateFactory<>();
                 factory.add(PredicateUtils.ne("enuu", enUU, false));
                 factory.add(PredicateUtils.in("prid", prodIds, false));
+                query.where(factory.toPredicate(root, query, cb));
                 return null;
             }
         });