From acd2b6eaf5ebd1a9d5aa1f54a741dfa6fc52ac10 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 27 十一月 2018 17:51:01 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java
index a75ea4e..7eb1d73 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java
@@ -516,7 +516,11 @@
// 璁剧疆SearchFilter
taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
totalSales);
- searchfilter.setEndPrice(new BigDecimal(99999));
+
+ // 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
+ if (searchfilter.getEndPrice() == null) {
+ searchfilter.setEndPrice(new BigDecimal(99999));
+ }
}
searchfilter.setPage(pageNo);
--
Gitblit v1.8.0