|
|
@@ -206,6 +206,13 @@ public class SaleOrderChangeController {
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
+ SearchFilter distribute = userService.distribute();
|
|
|
+ if (distribute != null && distribute.getDistribute() == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
|
|
|
+ filter.setDistribute(distribute.getDistribute());
|
|
|
+ }
|
|
|
// filter.setDistribute(userService.distribute().getDistribute());
|
|
|
Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
|
|
|
orders.setContent(orderchanges.getContent());
|
|
|
@@ -232,6 +239,13 @@ public class SaleOrderChangeController {
|
|
|
pageInfo.filter("unNeedReply", Constant.NO);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
+ SearchFilter distribute = userService.distribute();
|
|
|
+ if (distribute != null && distribute.getDistribute() == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
|
|
|
+ filter.setDistribute(distribute.getDistribute());
|
|
|
+ }
|
|
|
// filter.setDistribute(userService.distribute().getDistribute());
|
|
|
Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
|
|
|
orders.setContent(orderchanges.getContent());
|
|
|
@@ -258,6 +272,13 @@ public class SaleOrderChangeController {
|
|
|
pageInfo.filter("unNeedReply", Constant.NO);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
+ SearchFilter distribute = userService.distribute();
|
|
|
+ if (distribute != null && distribute.getDistribute() == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
|
|
|
+ filter.setDistribute(distribute.getDistribute());
|
|
|
+ }
|
|
|
// filter.setDistribute(userService.distribute().getDistribute());
|
|
|
Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
|
|
|
orders.setContent(orderchanges.getContent());
|
|
|
@@ -283,6 +304,13 @@ public class SaleOrderChangeController {
|
|
|
pageInfo.filter("unNeedReply", Constant.YES);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
|
+ SearchFilter distribute = userService.distribute();
|
|
|
+ if (distribute != null && distribute.getDistribute() == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
|
|
|
+ filter.setDistribute(distribute.getDistribute());
|
|
|
+ }
|
|
|
// filter.setDistribute(userService.distribute().getDistribute());
|
|
|
Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
|
|
|
orders.setContent(orderchanges.getContent());
|