From 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 09 Dec 2020 09:54:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
index ac9b2ec..69a4dc0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
@@ -115,7 +115,7 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
List<SysShopInfo> shops=null;
if(DataAuthUtil.hasAllShopAuth()){
- shops = shopInfoDao.selectShopInfo(user.getCompanyId());
+ shops= shopInfoDao.selectShopInfo(user.getCompanyId());
}else{
shops=Arrays.asList(shopInfoDao.selectById(user.getShopId()));
}
--
Gitblit v1.9.1