|
@@ -1,5 +1,6 @@
|
|
|
package com.uas.platform.b2c.common.search.service.impl;
|
|
package com.uas.platform.b2c.common.search.service.impl;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.b2c.common.account.model.User;
|
|
import com.uas.platform.b2c.common.account.model.User;
|
|
|
import com.uas.platform.b2c.common.search.dao.SearchHistoryDao;
|
|
import com.uas.platform.b2c.common.search.dao.SearchHistoryDao;
|
|
@@ -356,7 +357,12 @@ public class SearcherServiceImpl implements SearcherService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
private com.uas.platform.b2c.common.search.util.PageParams convertPageParams(PageParams params) {
|
|
private com.uas.platform.b2c.common.search.util.PageParams convertPageParams(PageParams params) {
|
|
|
- PageInfo pageinfo = new PageInfo(params);
|
|
|
|
|
|
|
+ PageInfo pageinfo = null;
|
|
|
|
|
+ if (null == params.getSorting() || "".equals(params.getSorting()) || "{}".equals(params.getSorting()) || JSON.parseObject(params.getSorting()).size() == 0){
|
|
|
|
|
+ pageinfo = new PageInfo();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ pageinfo = new PageInfo(params);
|
|
|
|
|
+ }
|
|
|
com.uas.platform.b2c.common.search.util.PageParams pageParams = new com.uas.platform.b2c.common.search.util.PageParams();
|
|
com.uas.platform.b2c.common.search.util.PageParams pageParams = new com.uas.platform.b2c.common.search.util.PageParams();
|
|
|
pageParams.setPage(params.getPage());
|
|
pageParams.setPage(params.getPage());
|
|
|
pageParams.setSize(params.getCount());
|
|
pageParams.setSize(params.getCount());
|
|
@@ -367,7 +373,7 @@ public class SearcherServiceImpl implements SearcherService {
|
|
|
pageParams.filter(FilterField.valueOf(entry.getKey().toUpperCase()), entry.getValue());
|
|
pageParams.filter(FilterField.valueOf(entry.getKey().toUpperCase()), entry.getValue());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (!StringUtils.isEmpty(params.getSorting())){
|
|
|
|
|
|
|
+ if (!StringUtils.isEmpty(pageinfo.getSort())){
|
|
|
//com.alibaba.fastjson.JSONObject sort = FastjsonUtils.parseObject(params.getSorting());
|
|
//com.alibaba.fastjson.JSONObject sort = FastjsonUtils.parseObject(params.getSorting());
|
|
|
Iterator<org.springframework.data.domain.Sort.Order> iterator = pageinfo.getSort().iterator();
|
|
Iterator<org.springframework.data.domain.Sort.Order> iterator = pageinfo.getSort().iterator();
|
|
|
com.uas.platform.b2c.common.search.util.Sort sort = new com.uas.platform.b2c.common.search.util.Sort();
|
|
com.uas.platform.b2c.common.search.util.Sort sort = new com.uas.platform.b2c.common.search.util.Sort();
|