企业产品库添加业务员搜索

src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -74,9 +74,9 @@ public class ProductController {
      * @return all products
      */
     @RequestMapping(method = RequestMethod.GET, params = "_status=all")
-	Page<V_ProductPrivate> getAllProducts(PageParams page, String keyword, String type) {
+	Page<V_ProductPrivate> getAllProducts(PageParams page, String keyword, String type, Long userUU) {
 		PageInfo info = new PageInfo(page);
-		return productService.getAllProducts(info, keyword, type);
+		return productService.getAllProducts(info, keyword, type, userUU);
 	}
 
 	/**

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

@@ -3,6 +3,8 @@ package com.uas.platform.b2c.prod.commodity.dao;
 import com.uas.platform.b2c.prod.commodity.model.ProductPerson;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -29,4 +31,13 @@ public interface ProductPersonDao extends JpaRepository<ProductPerson, Long>, Jp
      * @return
      */
     List<ProductPerson> findByProductId(Long productId);
+
+    /**
+     * 根据enuu和userUU查询物料信息
+     * @param enuu
+     * @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);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/ProductService.java

@@ -24,7 +24,7 @@ public interface ProductService {
      * @param type    the type 标准or非标准
      * @return all products
      */
-    Page<V_ProductPrivate> getAllProducts(PageInfo page, String keyword, String type);
+    Page<V_ProductPrivate> getAllProducts(PageInfo page, String keyword, String type, Long userUU);
 
     /**
      * 分页获取个人物料资料

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.advertise.ad.service.RecommendProductService;
+import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.core.config.SysConf;
@@ -201,14 +202,18 @@ public class ProductServiceImpl implements ProductService {
     @Autowired
     private ProductReplaceDao productReplaceDao;
 
+    @Autowired
+    private UserDao userDao;
+
     @Value("#{sys.productServiceIp}")
     private String productServiceIp;
 
     private ConcurrentHashMap<String, Field> sortFields = new ConcurrentHashMap<String, Field>();
 
     @Override
-    public Page<V_ProductPrivate> getAllProducts(final PageInfo page, String keyword, String type) {
-        page.expression(PredicateUtils.eq("enUU", SystemSession.getUser().getEnterprise().getUu(), true));
+    public Page<V_ProductPrivate> getAllProducts(final PageInfo page, String keyword, String type, Long userUU) {
+        Long enuu = SystemSession.getUser().getEnterprise().getUu();
+        page.expression(PredicateUtils.eq("enUU", enuu, true));
         page.expression(PredicateUtils.isNotNull("pcmpcode"));
         page.expression(PredicateUtils.isNotNull("pbranden"));
         if (StringUtils.isEmpty(type)) {
@@ -241,6 +246,12 @@ public class ProductServiceImpl implements ProductService {
             page.expression(logicalExpression4);
         }
 
+        if (!StringUtils.isEmpty(userUU)) {
+            // 先查询userUU在当前企业 有哪些物料
+            List<Long> ids = productPersonDao.findIdByEnuuAndUserUU(enuu, userUU);
+            page.expression(PredicateUtils.in("id", ids, true));
+        }
+
         Page<V_ProductPrivate> productPage = v_productPrivateDao.findAll(new Specification<V_ProductPrivate>() {
             @Override
             public Predicate toPredicate(Root<V_ProductPrivate> root, CriteriaQuery<?> query, CriteriaBuilder cb) {

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -188,6 +188,12 @@
 		box-shadow: none;
 		border-right: none;
 	}
+	.search-check .search .form-control:first-child {
+		width: 80px;
+	}
+	.search-check .search .form-control:nth-child(2) {
+		width: 260px;
+	}
 	.search-check .search button,.search-check .search a{
 		display: inline-block;
 		width: 94px;
@@ -1613,6 +1619,7 @@
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
 				<div class="search fl">
+					<input type="text" class="form-control" ng-model="param.userUU" ng-search="onSearch()" placeholder="业务员"/>
 					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
 					<button ng-click="onSearch()">搜索</button>
 					<!--<a ng-click="download()">批量导出</a>-->