Merge remote-tracking branch 'origin/feature/yc-mobile_maimai-0525' into feature/yc-mobile_maimai-0525

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -733,25 +733,30 @@ public class StoreInServiceImpl implements StoreInService {
                     }
                 }
 
-                if (CollectionUtils.isNotEmpty(storeIds)) {
-                    keywordLogicalEx = PredicateUtils.in("uuid", storeIds, true);
+                if (CollectionUtils.isEmpty(storeIds)) {
+                    storeIds.add("");
                 }
+				keywordLogicalEx = PredicateUtils.in("uuid", storeIds, true);
             } else {
                 nameSimpleEx = PredicateUtils.like("storeName", keyword, true);
             }
-		}
 
-		if (nameSimpleEx != null) {
-            if (typeLogicalEx != null) {
-                pageInfo.expression(PredicateUtils.and(nameSimpleEx, typeLogicalEx));
-            } else {
-                pageInfo.expression(nameSimpleEx);
-            }
-        } else if (typeLogicalEx != null) {
+			if (nameSimpleEx != null) {
+				if (typeLogicalEx != null) {
+					pageInfo.expression(PredicateUtils.and(nameSimpleEx, typeLogicalEx));
+				} else {
+					pageInfo.expression(nameSimpleEx);
+				}
+			} else if (typeLogicalEx != null) {
 				pageInfo.expression(PredicateUtils.and(keywordLogicalEx, typeLogicalEx));
 			} else {
 				pageInfo.expression(keywordLogicalEx);
 			}
+		} else if (typeLogicalEx != null) {
+			pageInfo.expression(typeLogicalEx);
+		}
+
+
 
 		return storeDao.findAll(new Specification<StoreIn>() {
 			@Override

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

@@ -1093,11 +1093,11 @@
                                 </div>
                             </div>
                             <div class="fr wid135">
+                                <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
+                                <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
                                 <p ng-if="!commodity.uuid">类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
                                 <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
                                 <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></p>
-                                <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
-                                <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
                                 <p>规格: <em ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}">LPC1112</em></p>
                                 <!--<div class="margin0">-->
                                     <!--<span class="marginL10">规格: </span>-->
@@ -1197,9 +1197,9 @@
                                         </div>
                                     </div>
                                     <div class="fr wid135">
+                                        <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
                                         <p>类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
                                         <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>
-                                        <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
                                         <p>
                                             <span style="width: 32px;">规格: </span>
                                             <span><input style="width:90px" type="text"