From 5a3242a93a5920a2510288d7ff671d883710df2f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 19:36:27 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
index 730ef3d..853b8e5 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
@@ -18,7 +18,6 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
-import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
@@ -143,7 +142,11 @@
// if (!DataAuthUtil.hasAllShopAuth()) {
// orderListDto.setShopId(user.getShopId());
// }
- QueryUtil.setQueryLimitCom(orderListDto);
+
+ if(ObjectUtil.isNotEmpty(user.getCompanyId())){
+ orderListDto.setCompanyId(user.getCompanyId());
+ }
+// QueryUtil.setQueryLimitCom(orderListDto);
List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);
AjaxResult result = AjaxResult.buildSuccessInstance("");
--
Gitblit v1.9.1