From 76f93da5aabffcd237be71e21c3ad7e8eb991804 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Dec 2020 17:57:45 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java | 6 +++++-
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 5 ++++-
2 files changed, 9 insertions(+), 2 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 2d01e4c..4f7c62a 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
@@ -12,6 +12,7 @@
import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
import com.matrix.system.app.vo.ShoppingGoodsListVo;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.bean.ShoppingGoodsCategory;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
@@ -128,7 +129,9 @@
pageVo.setOffset(offset);
pageVo.setLimit(limit);
- orderListDto.setShopId(user.getShopId());
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ orderListDto.setShopId(user.getShopId());
+ }
return AjaxResult.buildSuccessInstance(sysOrderService.findApiOrderListInPage(orderListDto, pageVo), sysOrderService.findApiOrderListTotal(orderListDto));
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java
index 9ff080f..7dc234e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateOderItemDto.java
@@ -54,7 +54,11 @@
}
public String getIsFree() {
- return isFree;
+ if ("1".equals(isFree)) {
+ return "是";
+ } else {
+ return "否";
+ }
}
public void setIsFree(String isFree) {
--
Gitblit v1.9.1