From d524c2c3f60032916218a638ee5fa610cd2a330c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:37 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index 473e1a4..cd34e93 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -219,7 +219,7 @@
if (!DataAuthUtil.hasAllShopAuth()) {
sysOrder.setShopId(getMe().getShopId());
}
- QueryUtil.setQueryLimitCom(sysOrder);
+ sysOrder.setCompanyId(getMe().getCompanyId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
orderService.findTotal(sysOrder));
}
@@ -505,7 +505,7 @@
// if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
// && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
- && BooleanEnum.TRUE.getValue() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) {
+ && BooleanEnum.TRUE.getValue() == shopManageAbleCancelDfkOrder.getIntParamValue()) {
if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");
--
Gitblit v1.9.1