From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 2bb6af6..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;
@@ -123,8 +125,8 @@
}else{
//点赞
- zaned.add(user.getSuId());
- zans=StringUtils.collToStr(zaned,",");
+ zanIds.add(user.getSuId());
+ zans=StringUtils.collToStr(zanIds,",");
}
}else{
//直接点赞
@@ -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 需要设置跨店数据权限
@@ -167,4 +171,14 @@
+
+
+
+
+
+
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1