From ba7ef6a2cfeff873da48469cc775c5f928ea45e8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:38 +0800
Subject: [PATCH] Merge branch 'ty_fix' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 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 a60adcd..68cd634 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
@@ -239,7 +239,7 @@
public @ResponseBody
ModelAndView printOrder(SysOrder order) throws GlobleException {
ModelAndView mv = new ModelAndView("admin/hive/beautySalon/print-order");
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ SysUsers user = getMe();
String comRegisterCode = companyDao.selectById(user.getCompanyId()).getComRegisterCode();
if (StringUtils.isNotBlank(comRegisterCode)) {
mv.addObject("page", comRegisterCode);
--
Gitblit v1.9.1