From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java
index ca1c8b5..afa562a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java
@@ -5,6 +5,7 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.service.SysShopInfoService;
@@ -33,7 +34,7 @@
SysShopInfo shopInfo = new SysShopInfo();
QueryUtil.setQueryLimitCom(shopInfo);
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if(!DataAuthUtil.hasAllShopAuth()){
shopInfo.setId(sysUsers.getShopId());
}
--
Gitblit v1.9.1