|
|
@@ -10,7 +10,6 @@ import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.Sort.Direction;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
@@ -22,7 +21,6 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.uas.platform.b2b.model.Distribute;
|
|
|
-import com.uas.platform.b2b.model.SearchFilter;
|
|
|
import com.uas.platform.b2b.model.User;
|
|
|
import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.model.VendorContact;
|
|
|
@@ -33,7 +31,6 @@ import com.uas.platform.b2b.support.JxlsExcelView;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.PageParams;
|
|
|
-import com.uas.search.b2b.model.MultiValue;
|
|
|
import com.uas.search.b2b.model.SPage;
|
|
|
import com.uas.search.b2b.model.Sort;
|
|
|
import com.uas.search.b2b.model.Sort.Type;
|
|
|
@@ -67,17 +64,6 @@ public class VendorController {
|
|
|
PageInfo info = new PageInfo(params);
|
|
|
com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
|
|
|
pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
|
|
|
- SearchFilter filter = userService.distribute();
|
|
|
- if (filter != null && filter.getDistribute() == null) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
|
|
|
- List<Object> list = new ArrayList<>();
|
|
|
- for (Object object : filter.getDistribute()) {
|
|
|
- list.add(object);
|
|
|
- }
|
|
|
- pageParams.getFilters().put("ve_vendenuu", new MultiValue(list, true));
|
|
|
- }
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
|
sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
|
|
|
pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
|
hejq