From 11f925fdce0f58d1f321f3a13a3f3e84221c6912 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 09:27:14 +0800
Subject: [PATCH] 整理代码

---
 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java |   53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 13 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..f6bb989 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
@@ -2,16 +2,19 @@
 
 import com.consum.base.BaseController;
 import com.consum.base.pojo.BaseWarehouseParam;
-import com.consum.base.pojo.FinSysTenantDepartmentParam;
 import com.consum.base.service.BaseWarehouseServiceImpl;
 import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description 浠撳簱绠＄悊
@@ -38,7 +41,9 @@
         //TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
 
         int result = this.baseWarehouseService.add(param);
-        if (result > 0) return ResponseValue.success(1);
+        if (result > 0) {
+            return ResponseValue.success(1);
+        }
         return ResponseValue.error("鏂板澶辫触锛�");
     }
 
@@ -49,11 +54,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 +82,8 @@
     }
 
     /**
-     * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+     * 鏍规嵁浠撳簱id鏌ヨ浠撳簱璇︽儏
+     *
      * @author 鍗㈠簡闃�
      * @Date 2023/10/26
      */
@@ -87,7 +93,9 @@
             return ResponseValue.error("浠撳簱id涓虹┖");
         }
         BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id);
-        if (baseWarehouse == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+        if (baseWarehouse == null) {
+            return ResponseValue.error("鏌ヨ澶辫触锛�");
+        }
         return ResponseValue.success("鏌ヨ鎴愬姛!", baseWarehouse);
     }
 
@@ -113,12 +121,31 @@
      */
     @GetMapping("/select/userList")
     public ResponseValue queryList(Long baseWarehouseId) {
-        if (baseWarehouseId == null){
+        if (baseWarehouseId == null) {
             return ResponseValue.error("浠撳簱id涓虹┖");
         }
         this.baseWarehouseService.queryUserList(baseWarehouseId);
         return ResponseValue.success();
     }
 
+    /**
+     * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/27
+     */
+    @GetMapping("/select/tenant_warehouse")
+    public ResponseValue getByAgencyId(Long agencyId) {
+        // TODO 鏆傛棤鏈烘瀯
+//        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