From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java
index 47e7a0b..3309ce6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java
@@ -7,7 +7,7 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.constance.Dictionary;
+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;
@@ -108,6 +108,16 @@
QueryUtil.setQueryLimitCom(shopInfo);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findByModel(shopInfo), null);
}
+
+ @RequestMapping(value = "/findAllWithPermi" )
+ public @ResponseBody AjaxResult findAllWithPermi(SysShopInfo shopInfo) {
+ QueryUtil.setQueryLimitCom(shopInfo);
+ SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ shopInfo.setId(sysUsers.getShopId());
+ }
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findByModel(shopInfo), null);
+ }
/**
* 查询非总店 商城店铺的门店
* TODO 微商城不应该调用这里的接口
--
Gitblit v1.9.1