From b749000c83f80914b60b8e48a7097942dae70513 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:43 +0800
Subject: [PATCH] 部门分发只能查看本机构下的
---
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 7 +++++--
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 4 ++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 0f13fd5..36d81c9 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -158,11 +158,15 @@
defaultValue: '',
},
],
+ filterFrom: {},
// 鏍戞暟鎹�
treeDataList: []
};
},
created() {
+ this.filterFrom = {
+ outAgencyId: this.userInfo.tenantId,
+ };
this.fetchData()
},
methods: {
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index d37cff6..ff4f99a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -220,8 +220,9 @@
@GetMapping("/query/goodsTemplate")
public ResponseValue queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
+ // TODO 涓嶉檺鍒舵満鏋�
List<BaseGoodsTemplate> list =
- this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, categoryId, null, null);
+ this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(null, categoryId, null, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -250,7 +251,9 @@
String sql =
"SELECT DISTINCT bgt.id,bgt.GOODS_NAME, CLASSIFICATION type FROM l_wh_goods g LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.id "
- + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID = :warehouseId " + "AND CATEGORY_ID = :categoryId "
+ + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID = :warehouseId "
+ // TODO 涓存椂瑙ｅ喅
+ /*+ "AND CATEGORY_ID = :categoryId "*/
// 1:闆嗛噰,2:鑷噰
+ "AND BUY_TYPE =1";
--
Gitblit v1.9.1