Merge branch 'dev'

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

@@ -168,7 +168,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param pBrandEn 品牌
      * @return 存在相同物料的其他企业UU号
      */
-    @Query(value = "select p.pr_enuu from v$product$private p where p.pr_enuu <> :enUU and p.pr_pcmpcode = :pCmpCode and p.pr_pbranden = :pBrandEn and p.pr_b2cenabled = 1 group by p.pr_enuu", nativeQuery = true)
+    @Query(value = "select distinct p.pr_enuu from v$product$private p where p.pr_enuu <> :enUU and p.pr_pcmpcode = :pCmpCode and p.pr_pbranden = :pBrandEn and p.pr_b2cenabled = 1", nativeQuery = true)
     List<Long> getBusinessOpportunityWithPBrandEn(@Param("enUU")Long enUU, @Param("pCmpCode")String pCmpCode, @Param("pBrandEn")String pBrandEn);
 
     /**
@@ -178,7 +178,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param pCmpCode 物料原厂型号
      * @return 存在相同物料的其他企业UU号
      */
-    @Query(value = "select p.pr_enuu from v$product$private p where p.pr_enuu <> :enUU and p.pr_pcmpcode = :pCmpCode and p.pr_b2cenabled = 1 group by p.pr_enuu", nativeQuery = true)
+    @Query(value = "select distinct p.pr_enuu from v$product$private p where p.pr_enuu <> :enUU and p.pr_pcmpcode = :pCmpCode and p.pr_b2cenabled = 1", nativeQuery = true)
     List<Long> getBusinessOpportunityWithoutPBrandEn(@Param("enUU")Long enUU, @Param("pCmpCode")String pCmpCode);
 
 

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

@@ -3,15 +3,11 @@ package com.uas.ps.product.service.impl;
 import com.uas.platform.core.persistence.criteria.PredicateFactory;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.ps.core.page.PageInfo;
-import com.uas.ps.core.page.criteria.CriterionExpression;
-import com.uas.ps.core.page.criteria.LogicalExpression;
-import com.uas.ps.core.page.criteria.SimpleExpression;
 import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.core.util.StringUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.ProductUsers;
 import com.uas.ps.product.entity.Constant;
-import com.uas.ps.product.entity.ProductSaler;
 import com.uas.ps.product.repository.ProductDao;
 import com.uas.ps.product.repository.ProductUsersDao;
 import com.uas.ps.product.search.SPageUtils;
@@ -29,11 +25,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 个人物料
@@ -172,7 +164,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
             public Predicate toPredicate(Root<ProductUsers> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 final PredicateFactory<ProductUsers> factory = new PredicateFactory<>();
                 factory.add(PredicateUtils.ne("enuu", enUU, false));
-                factory.add(PredicateUtils.and (PredicateUtils.isNotNull("product.cmpCode"), PredicateUtils.eq("product.cmpCode", cmpCode, false)));
+                factory.add(PredicateUtils.eq("product.cmpCode", cmpCode, false));
                 query.where(factory.toPredicate(root, query, cb));
                 return null;
             }