Merge branch 'dev' into release-20170915

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandSubmitServiceImpl.java

@@ -12,6 +12,10 @@ import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.ServiceCode;
 import com.uas.platform.core.model.Status;
+import com.uas.platform.core.persistence.criteria.CriterionExpression;
+import com.uas.platform.core.persistence.criteria.LogicalExpression;
+import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -222,7 +226,12 @@ public class BrandSubmitServiceImpl implements BrandSubmitService {
 	@Override
 	public Page<BrandSubmit> findAllBrand(final PageInfo pageInfo, String keyword) {
 		if (StringUtils.hasText(keyword)) {
-			pageInfo.filter("nameEn", keyword, true);
+			SimpleExpression nameEn = new SimpleExpression("nameEn", keyword, CriterionExpression.Operator.LIKE);
+			SimpleExpression nameCn = new SimpleExpression("nameCn", keyword, CriterionExpression.Operator.LIKE);
+			SimpleExpression userName = new SimpleExpression("userModify.userName", keyword, CriterionExpression.Operator.LIKE);
+			SimpleExpression[] simpleExpressions = new SimpleExpression[]{nameEn, nameCn, userName};
+			LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
+			pageInfo.expression(logicalExpression);
 		}
 		return brandSubmitDao.findAll(new Specification<BrandSubmit>() {
 			@Override

src/main/webapp/resources/css/user/user.css

@@ -1034,6 +1034,7 @@ body {
 
 .oder_list dl .line01 img {
     margin-right: 5px;
+    margin-bottom: 5px;
     vertical-align: middle;
 }
 

src/main/webapp/resources/view/admin/audit_brand.html

@@ -20,7 +20,7 @@
 				<div class="col-sm-6">
 					<div class="input-group" style="float: right">
 						<input type="search" class="form-control ng-pristine ng-valid ng-touched" ng-model="keyword" 
-							ng-search="onSearch()" placeholder="按品牌名搜索">
+							ng-search="onSearch()" placeholder="按品牌名/提交人搜索">
 						<div class="input-group-btn">
 							<button ng-click="onSearch()" class="btn btn-primary" type="button">搜索</button>
 						</div>