From 28d2d010f0dda4c11c024d516287aeee6094548b Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 13 Dec 2020 19:04:45 +0800
Subject: [PATCH] finish daily-list-new

---
 zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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..755216d 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,6 +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.common.constance.AppConstance;
 import com.matrix.system.constance.Dictionary;
 import com.matrix.system.hive.action.util.QueryUtil;
 import com.matrix.system.hive.bean.SysShopInfo;
@@ -108,6 +109,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(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+			shopInfo.setId(sysUsers.getShopId());
+		}
+		return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findByModel(shopInfo), null);
+	}
 	/**
 	 * 查询非总店 商城店铺的门店
 	 * TODO 微商城不应该调用这里的接口

--
Gitblit v1.9.1