From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
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