From 1e77ffda09c081c1b9320afe28ecaf15b6b7fd20 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:32:24 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index d7800f5..65bc372 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -14,6 +14,7 @@
import com.matrix.system.app.mapper.SysProjUseMapper;
import com.matrix.system.app.vo.*;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysProjServices;
@@ -156,8 +157,11 @@
pageVo.setOffset(offset);
pageVo.setLimit(limit);
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- orderListDto.setShopId(user.getShopId());
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ orderListDto.setShopId(user.getShopId());
+ orderListDto.setUserId(user.getSuId());
+ }
return AjaxResult.buildSuccessInstance(projServicesService.findApiServiceOrderListInPage(orderListDto, pageVo), projServicesService.findApiServiceOrderListTotal(orderListDto));
}
--
Gitblit v1.9.1