From 85dce973eb29eb2372c76d5b95b30354da9c41c8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:08:51 +0800
Subject: [PATCH] fead:新增收银员字段

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
index a792454..25fa419 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
@@ -6,6 +6,8 @@
 import com.matrix.core.tools.WebUtil;
 import com.matrix.system.app.dto.*;
 import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.hive.action.util.QueryUtil;
 import com.matrix.system.hive.bean.*;
 import com.matrix.system.hive.dao.*;
 import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -157,7 +159,9 @@
     @PostMapping(value = "/findFollowup")
     public AjaxResult findFollowup(@RequestBody @Validated FollowupListDto followupListDto) {
         SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-        followupListDto.setShopId(user.getShopId());
+        if(!DataAuthUtil.hasAllShopAuth()){
+            followupListDto.setShopId(user.getShopId());
+        }
         followupListDto.setCompanyId(user.getCompanyId());
         followupListDto.setSelfStaff(user.getSuId());
         //TODO 需要设置跨店数据权限

--
Gitblit v1.9.1