Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -134,7 +134,8 @@ public class MakeOrderController {
             pageInfo.setSort(new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, "date"));
 		    pageInfo.filter("status", Status.REPLIED.value());
 		    pageInfo.filter("end", Constant.NO);
-            if (null != distribute) {
+			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+			if (null != distribute) {
                 pageInfo.expression(PredicateUtils.in("enUU", distribute.getDistribute(), true));
             }
 		    return SPageUtils.covertSPage(makeOrderService.findAllDetailByPageInfo(pageInfo, filter));
@@ -179,6 +180,7 @@ public class MakeOrderController {
             pageInfo.setSort(new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, "date"));
             pageInfo.filter("status", Status.NOT_REPLY.value());
             pageInfo.filter("end", Constant.NO);
+            pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
             if (null != distribute) {
                 pageInfo.expression(PredicateUtils.in("enUU", distribute.getDistribute(), true));
             }
@@ -223,7 +225,8 @@ public class MakeOrderController {
             PageInfo pageInfo = new PageInfo(params);
             pageInfo.setSort(new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, "date"));
             pageInfo.filter("end", Constant.YES);
-            if (null != distribute) {
+			pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+			if (null != distribute) {
                 pageInfo.expression(PredicateUtils.in("enUU", distribute.getDistribute(), true));
             }
             return SPageUtils.covertSPage(makeOrderService.findAllDetailByPageInfo(pageInfo, filter));