【商务平台】 增加客户关联过滤

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@6643 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/MakeAcceptController.java

@@ -13,17 +13,20 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeAcceptService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -43,6 +46,8 @@ public class MakeAcceptController {
 	@Autowired
 	private MakeAcceptService makeAcceptService;
 
+	@Autowired
+	private UserService userService;
 	@Autowired
 	private SearchService searchService;
 
@@ -62,7 +67,15 @@ public class MakeAcceptController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/MakeOrderChangeController.java

@@ -16,11 +16,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderChangeService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -28,6 +30,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+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;
@@ -46,6 +49,8 @@ public class MakeOrderChangeController {
 	@Autowired
 	private MakeOrderChangeService makeOrderChangeService;
 
+	@Autowired
+	private UserService userService;
 	@Autowired
 	private SearchService searchService;
 
@@ -66,6 +71,15 @@ public class MakeOrderChangeController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("mcd_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("mcd_enuu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("mcd_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/MakeOrderController.java

@@ -16,12 +16,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeOrderReply;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -32,6 +34,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -53,6 +56,8 @@ public class MakeOrderController {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	private UserService userService;
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -71,7 +76,15 @@ public class MakeOrderController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
@@ -95,6 +108,15 @@ public class MakeOrderController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("ma_status", Status.REPLIED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
@@ -119,6 +141,15 @@ public class MakeOrderController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("ma_status", Status.NOT_REPLY.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
@@ -143,6 +174,15 @@ public class MakeOrderController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("ma_end", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();

src/main/java/com/uas/platform/b2b/controller/MakeOutOrderController.java

@@ -13,11 +13,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -25,6 +27,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+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;
@@ -46,6 +49,9 @@ public class MakeOutOrderController {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	private UserService userService;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -65,7 +71,15 @@ public class MakeOutOrderController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ma_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ma_venduu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/MakeReturnController.java

@@ -13,17 +13,20 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeReturnService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -47,6 +50,9 @@ public class MakeReturnController {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	private UserService userService;
+
 	/**
 	 * 作为卖家，客户的委外验收单（全部）
 	 * 
@@ -65,7 +71,15 @@ public class MakeReturnController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("mr_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("mr_enuu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("mr_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/PurchaseARCheckController.java

@@ -16,12 +16,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleARCheckItem;
 import com.uas.platform.b2b.model.SaleARCheckReply;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.SaleARCheckService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -29,6 +31,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+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;
@@ -51,6 +54,9 @@ public class PurchaseARCheckController {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	private UserService userService;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -67,7 +73,15 @@ public class PurchaseARCheckController {
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("sac_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("sac_venduu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("sac_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/SaleAcceptController.java

@@ -13,7 +13,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.uas.platform.b2b.model.PurchaseAccept;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseAcceptService;
 import com.uas.platform.b2b.service.UserService;
@@ -23,6 +25,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -64,6 +67,15 @@ public class SaleAcceptController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pa_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pa_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleApBillController.java

@@ -13,15 +13,19 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.uas.platform.b2b.model.PurchaseApBill;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseApBillService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -43,6 +47,9 @@ public class SaleApBillController {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	private UserService userService;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -59,7 +66,15 @@ public class SaleApBillController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pad_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pad_enuu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pad_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -37,6 +37,7 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -212,7 +213,15 @@ public class SaleApCheckController {
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pa_custuu", new MultiValue(list, true));
+		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
@@ -231,6 +240,15 @@ public class SaleApCheckController {
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pa_custuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pa_checkstatus", "未对账");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
@@ -252,6 +270,15 @@ public class SaleApCheckController {
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pa_custuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pa_checkstatus", "已确认");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
@@ -271,6 +298,15 @@ public class SaleApCheckController {
 		// 当前登录企业作为买家
 		pageParams.getFilters().put("pa_enuu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pa_custuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pa_checkstatus", "已作废");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();

src/main/java/com/uas/platform/b2b/controller/SaleBadInController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseBadIn;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseBadInService;
 import com.uas.platform.b2b.service.UserService;
@@ -23,6 +25,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -62,6 +65,15 @@ public class SaleBadInController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pb_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pb_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pb_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleBadOutController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseBadOut;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseBadOutService;
 import com.uas.platform.b2b.service.UserService;
@@ -23,6 +25,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -62,6 +65,15 @@ public class SaleBadOutController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("po_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("po_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("po_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleCustomerForecastController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseForecastOrderService;
 import com.uas.platform.b2b.service.UserService;
@@ -24,6 +26,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -63,6 +66,15 @@ public class SaleCustomerForecastController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pfd_pfid", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pfd_pfid", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pfd_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleInquiryController.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+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;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.service.UserService;
@@ -30,6 +32,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -69,6 +72,15 @@ public class SaleInquiryController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -88,6 +100,15 @@ public class SaleInquiryController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_inid", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
@@ -109,6 +130,15 @@ public class SaleInquiryController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_inid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
@@ -130,6 +160,15 @@ public class SaleInquiryController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/SaleMRBController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseMRB;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseMRBService;
 import com.uas.platform.b2b.service.UserService;
@@ -23,6 +25,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -62,6 +65,15 @@ public class SaleMRBController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pm_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pm_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pm_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 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;
@@ -20,6 +21,7 @@ import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendAll;
 import com.uas.platform.b2b.model.SaleSendItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
 import com.uas.platform.b2b.service.UserService;
@@ -34,6 +36,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -74,6 +77,15 @@ public class SaleNoticeController {
 		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（全部）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pn_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pn_enuu", new MultiValue(list, true));
+		}
 		if (fromDate != null) {
 			pageParams.getFilters().put(SearchConstants.FROM_DATE_KEY, fromDate);
 		}
@@ -126,6 +138,15 @@ public class SaleNoticeController {
 		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（待发货）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pn_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pn_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pn_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("is_waiting", (short) Constant.NO);
 		if (fromDate != null) {
@@ -155,6 +176,15 @@ public class SaleNoticeController {
 		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（已发货）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pn_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pn_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pn_status", (short) Status.REPLIED.value());
 		pageParams.getFilters().put("pn_end", (short) Constant.NO);
 		if (fromDate != null) {
@@ -184,6 +214,15 @@ public class SaleNoticeController {
 		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（备料中）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pn_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pn_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("is_waiting", (short) Constant.YES);
 		if (fromDate != null) {
 			pageParams.getFilters().put(SearchConstants.FROM_DATE_KEY, fromDate);
@@ -212,6 +251,15 @@ public class SaleNoticeController {
 		logger.log("客户送货提醒", "查看收到的客户送货提醒列表（已结案）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pn_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pn_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pn_end", (short) Constant.YES);
 		if (fromDate != null) {
 			pageParams.getFilters().put(SearchConstants.FROM_DATE_KEY, fromDate);

src/main/java/com/uas/platform/b2b/controller/SaleOrderChangeController.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+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;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseOrderChange;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 import com.uas.platform.b2b.service.UserService;
@@ -29,6 +31,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -68,6 +71,15 @@ public class SaleOrderChangeController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pc_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pc_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -86,6 +98,15 @@ public class SaleOrderChangeController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pc_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pc_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
@@ -105,6 +126,15 @@ public class SaleOrderChangeController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pc_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pc_enuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("pc_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
@@ -41,6 +42,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -128,6 +130,15 @@ public class SaleOrderController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pu_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
+		}
 		// TODO 其他过滤条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
@@ -149,6 +160,15 @@ public class SaleOrderController {
 		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
+		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
@@ -171,6 +191,15 @@ public class SaleOrderController {
 		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
+		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
@@ -193,6 +222,15 @@ public class SaleOrderController {
 		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
+		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
@@ -214,6 +252,15 @@ public class SaleOrderController {
 		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
+		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
@@ -441,6 +488,15 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_venduu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -464,6 +520,15 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_venduu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -486,6 +551,15 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_venduu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -508,6 +582,15 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_venduu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -529,6 +612,15 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pu_venduu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleQuotationController.java

@@ -10,6 +10,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 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;
@@ -19,6 +20,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.SaleQuotation;
 import com.uas.platform.b2b.model.SaleQuotationItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.SaleQuotationService;
 import com.uas.platform.b2b.service.UserService;
@@ -31,6 +33,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -70,6 +73,15 @@ public class SaleQuotationController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("qu_enuu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pc_custuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -89,6 +101,15 @@ public class SaleQuotationController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("qu_enuu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pc_custuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("qu_status", Status.SUBMITTED.value());
 
 		List<Sort> sortList = new ArrayList<>();
@@ -110,6 +131,15 @@ public class SaleQuotationController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("qu_enuu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pc_custuu", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("qu_status", Status.INPUTTING.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/controller/SaleReturnController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.uas.platform.b2b.model.PurchaseReturn;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseReturnService;
 import com.uas.platform.b2b.service.UserService;
@@ -23,6 +25,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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;
@@ -62,6 +65,15 @@ public class SaleReturnController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("pr_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("pr_enuu", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/controller/SaleSampleController.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,6 +21,7 @@ import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingItem;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
@@ -33,6 +35,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
+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;
@@ -76,6 +79,15 @@ public class SaleSampleController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ppi_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ppi_id", new MultiValue(list, true));
+		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -96,6 +108,15 @@ public class SaleSampleController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, keyword);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ppi_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ppi_id", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("ppi_status", Status.UNSEND.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
@@ -117,6 +138,15 @@ public class SaleSampleController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("ppi_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("ppi_id", new MultiValue(list, true));
+		}
 		pageParams.getFilters().put("ppi_status", Status.SEND.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
@@ -194,6 +224,15 @@ public class SaleSampleController {
 		// 判断当前用户是否被客户分配
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("psa_venduu", 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<>();
+			list.add(filter.getDistribute());
+			pageParams.getFilters().put("psa_enuu", new MultiValue(list, true));
+		}
 		if (fromDate != null) {
 			pageParams.getFilters().put(SearchConstants.FROM_DATE_KEY, fromDate);
 		}