From 8ec414eb3a5173c1f53bd33b73519c78ca79938a Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 27 十月 2023 17:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index f278db3..f97656e 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* @Description 浠撳簱绠＄悊
* @Author 鍗㈠簡闃�
@@ -49,11 +51,11 @@
*/
@GetMapping("/list")
public ResponseValue queryList(BaseWarehouseParam param) {
- FinSysTenantUser sysInfo = this.getSysInfo();
- if (sysInfo == null) {
- return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
- }
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param,sysInfo);
+// FinSysTenantUser sysInfo = this.getSysInfo();
+// if (sysInfo == null) {
+// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+// }
+ GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
return ResponseValue.success(pager);
}
@@ -77,7 +79,7 @@
}
/**
- * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+ * 鏍规嵁浠撳簱id鏌ヨ浠撳簱璇︽儏
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -120,5 +122,21 @@
return ResponseValue.success();
}
+ /**
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
+ @GetMapping("/select/tenant_warehouse")
+ public ResponseValue getByAgencyId(Long agencyId) {
+ if (agencyId == null) {
+ return ResponseValue.error("鏈烘瀯id涓虹┖");
+ }
+ List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId);
+ if (list == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ return ResponseValue.success("鏌ヨ鎴愬姛!", list);
+ }
+
+
}
--
Gitblit v1.9.1