From 1f79de94f2fd5ff2b6de6556339aefd1c262dc40 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 27 Mar 2022 13:55:41 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index c31ba85..36f8eb7 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -218,6 +218,7 @@
if (!DataAuthUtil.hasAllShopAuth()) {
sysOrder.setShopId(getMe().getShopId());
}
+ sysOrder.setCompanyId(getMe().getCompanyId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
orderService.findTotal(sysOrder));
}
--
Gitblit v1.9.1