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

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -608,7 +608,7 @@ public class UserController {
 
 
 	/**
-	 * 通过姓名获取该企业所有人员信息
+	 * 通过姓名模糊查询该企业所有人员信息
 	 * @param enuu 企业uu号
 	 * @return 完整的企业人员信息
 	 */

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

@@ -249,7 +249,12 @@ public class ProductServiceImpl implements ProductService {
         if (!StringUtils.isEmpty(userUU)) {
             // 先查询userUU在当前企业 有哪些物料
             List<Long> ids = productPersonDao.findIdByEnuuAndUserUU(enuu, userUU);
-            page.expression(PredicateUtils.in("id", ids, true));
+
+            if (CollectionUtils.isEmpty(ids)) {
+                return null;
+            } else {
+                page.expression(PredicateUtils.in("id", ids, true));
+            }
         }
 
         Page<V_ProductPrivate> productPage = v_productPrivateDao.findAll(new Specification<V_ProductPrivate>() {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1265,22 +1265,30 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			loadDataReload();
 		};
 
-		$scope.prodName = '';
+		$scope.enUser = {
+			prodName:''
+		};
 		$scope.showSimilarUser = false;
 		$scope.similarUser = [];
 		$scope.similarUserObj = {
 			isInSimilarUser: false
 		};
-		$scope.onUserUUChange = function (prodName) {
-            Enterprise.findUserByUserNameLikeAndEnUU({page: 1, count: 8, userName: prodName, enuu: $rootScope.userInfo.enterprise.uu }, function (page) {
-                if (page.content && page.content.length) {
-					$scope.param.userUU = page.content[0]
-                    $scope.similarUser = page;
-                    $scope.showSimilarUser = true;
-                } else {
-					$scope.similarUser.content = [];
-				}
-            })
+		$scope.onUserUUChange = function () {
+            $scope.param.userUU = null;
+		    if ($scope.enUser.prodName && $scope.enUser.prodName.length) {
+                Enterprise.findUserByUserNameLikeAndEnUU({page: 1, count: 8, userName: $scope.enUser.prodName, enuu: $rootScope.userInfo.enterprise.uu }, function (page) {
+                    if (page.content && page.content.length) {
+                        $scope.similarUser = page;
+                        $scope.showSimilarUser = true;
+                    } else {
+                        $scope.similarUser.content = [];
+                        $scope.showSimilarUser = false;
+                    }
+                })
+            } else {
+                $scope.showSimilarUser = false;
+			}
+
         }
         $scope.onUserUUBlur = function () {
 			if (!$scope.similarUserObj.isInSimilarUser) {
@@ -1288,12 +1296,20 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			}
 		};
         $scope.setProdName = function (item) {
-			$scope.prodName = item.userName;
+			$scope.enUser.prodName = item.userName;
 			$scope.param.userUU = item.userUU;
 			$scope.showSimilarUser = false;
         }
 
 		var loadDataReload = function () {
+            $scope.currentNull = false;
+            if ($scope.enUser.prodName != "" && $scope.param.userUU == null) {
+                toaster.pop('error', '请选择正确的人员姓名！');
+                $scope.materialAll = null;
+                $scope.currenctMaterial = null;
+                $scope.currentDataNull = true;
+                return;
+            }
 			$scope.param.page = 1;
 			loadData();
 		};

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

@@ -183,13 +183,16 @@
 	}
 	.search-check .search .prodUserList {
 		position: absolute;
-		left: 29px;
+		left: 27px;
 		top: 35px;
 		font-size: 14px;
 		width: 155px;
 		max-height: 200px;
 		color: #666;
-		box-shadow: 0px 1px 6px 1px #cccccc9e;
+		-webkit-box-shadow: 0 1px 6px 1px #323232a3;
+		-moz-box-shadow: 0 1px 6px 1px #323232a3;
+		box-shadow: 0 1px 6px 1px #323232;
+        z-index: 999;
 	}
 	.search-check .search .prodUserList li {
 		height: 25px;
@@ -199,6 +202,7 @@
 	}
 	.search-check .search .prodUserList li:hover {
 		background: #e8e8e8;
+        cursor: default;
 	}
 	.search-check .search .form-control{
 		width: 340px;
@@ -1649,8 +1653,8 @@
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
 				<div class="search fl">
-					<label>人员选择：{{isInSimilarUser}}</label>
-					<input type="text" class="form-control prod-name" ng-model="prodName" ng-change="onUserUUChange(prodName)" ng-blur="onUserUUBlur()" placeholder="UU号/姓名"/>
+					<label>人员选择：</label>
+					<input type="text" class="form-control prod-name" ng-model="enUser.prodName" ng-change="onUserUUChange()" placeholder="姓名"/>
 					<ul ng-if="showSimilarUser" class="prodUserList" ng-mouseenter="similarUserObj.isInSimilarUser = true" ng-mouseleave="similarUserObj.isInSimilarUser = false">
 						<li ng-repeat="item in similarUser.content" ng-click="setProdName(item)">
 							{{item.userName}}（{{item.userUU}}）
@@ -2127,16 +2131,19 @@
 					<!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
 					</tbody>
 				</table>
-				<div class="empty" ng-if="currenctMaterial.length == 0">
+				<div class="empty" ng-if="!currenctMaterial || currenctMaterial.length == 0">
 					<p class="empty-img">
 						<img src="static/img/all/empty-cart.png">
 					</p>
-					<div class="empty-info">
+					<div class="empty-info" ng-if="currentDataNull || param.userUU">
+						<p class="grey"> 该业务员暂时没有绑定产品</p>
+					</div>
+					<div class="empty-info" ng-if="!currentDataNull && !param.userUU">
 						<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
 						<a href="vendor#/vendor_upload?type=company"><i></i>马上去上传</a>
 					</div>
 				</div>
-				<div class="record-line text-right" ng-if="currenctMaterial.length != 0">
+				<div class="record-line text-right" ng-if="currenctMaterial && currenctMaterial.length != 0">
 					<!--<div class="prompt" ng-show="standard_tab == 'unstandard'">-->
 						<!--<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>-->
 						<!--如需上架可先点击 【匹配】按钮，若匹配不成功，可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>，提出申请-->