From c633067f4d71f3d0e7b7c9e8b30aeb1a2ae6b452 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:29:59 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 4b2abba..5407910 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
@@ -1,6 +1,7 @@
package com.matrix.system.padApi.action;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
@@ -135,8 +136,11 @@
PaginationVO pageVo = new PaginationVO();
pageVo.setOffset(offset);
pageVo.setLimit(limit);
-// if (!DataAuthUtil.hasAllShopAuth()) {
+ if(ObjectUtil.isNotEmpty(user.getShopId())){
orderListDto.setShopId(user.getShopId());
+ }
+// if (!DataAuthUtil.hasAllShopAuth()) {
+// orderListDto.setShopId(user.getShopId());
// }
QueryUtil.setQueryLimitCom(orderListDto);
List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);
--
Gitblit v1.9.1