From e11162164d7b136e9de4c4b2e378b108cd87859f Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into developer

---
 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