From a3cddf45e9c7c590e8fe034e951189c49548f29f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Apr 2021 16:58:56 +0800
Subject: [PATCH] 20210421 签到
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
index f4a9622..67a8262 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -71,6 +71,7 @@
List<ShoppingGoodsCategory> byModel = shoppingGoodsCategoryService.findByModel(category);
ShoppingGoodsCategory type = new ShoppingGoodsCategory();
type.setName("全部");
+ type.setParentId(0L);
list.add(type);
list.addAll(byModel);
return AjaxResult.buildSuccessInstance(list);
@@ -83,7 +84,10 @@
@PostMapping(value = "/findShoppingGoods")
public AjaxResult findShoppingGoods(@RequestBody @Validated ShoppingGoodsListDto shoppingGoodsListDto) {
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- shoppingGoodsListDto.setShopId(user.getShopId());
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ shoppingGoodsListDto.setShopId(user.getShopId());
+ }
+ QueryUtil.setQueryLimitCom(shoppingGoodsListDto);
return AjaxResult.buildSuccessInstance(shoppingGoodsService.findShoppingGoodsListForApi(shoppingGoodsListDto), shoppingGoodsService.findShoppingGoodsListTotalForApi(shoppingGoodsListDto));
}
--
Gitblit v1.9.1