From 608f4bd5ff1a0024c04af0973b20ed360d1d16a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Nov 2021 11:34:52 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
index 3469bb4..354a30d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
@@ -11,8 +11,8 @@
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.CustomerDataDictionary;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveNew;
@@ -78,7 +78,7 @@
public @ResponseBody
AjaxResult findSumDailyInfoNew(@RequestBody AchieveNew achieveNew) {
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, achieveNewService.findSumDailyInfoNew(achieveNew, null),
@@ -95,7 +95,7 @@
AjaxResult findDailyInfoNew(@RequestBody AchieveNew achieveNew) {
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
achieveNew.setCompanyId(sysUsers.getCompanyId());
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
PaginationVO pageVo = new PaginationVO();
@@ -121,7 +121,7 @@
, "服务提成", "人头", "项目个数", "服务时间", "订单类型"};
orderSheet.setHeaders(header);
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
queryDto.setShopId(sysUsers.getShopId());
}
queryDto.setCompanyId(sysUsers.getCompanyId());
@@ -198,7 +198,7 @@
orderSheet.setHeaders(header);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
--
Gitblit v1.9.1