From 3a92361f2181c5d6fcd16536f3a9a80c89d193d6 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 16:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
index e7e3770..3be8eb5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
@@ -44,11 +44,9 @@
public AjaxResult findStoreList(@RequestBody @Validated StoreListDto storeListDto) {
SysStoreInfo sysStoreInfo = new SysStoreInfo();
- if (!DataAuthUtil.hasAllShopAuth()) {
- SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- sysStoreInfo.setShopId(users.getShopId());
- sysStoreInfo.setCompanyId(users.getCompanyId());
- }
+ SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ sysStoreInfo.setShopId(users.getShopId());
+ sysStoreInfo.setCompanyId(users.getCompanyId());
sysStoreInfo.setQueryKey(storeListDto.getQueryKey());
PaginationVO pageVo = new PaginationVO();
pageVo.setOffset((storeListDto.getPageNum() - 1) * storeListDto.getPageSize());
--
Gitblit v1.9.1