From 253cbac39221c0b019fd311c7a9a3fdcd036d294 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Mon, 9 Oct 2023 17:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8C=89=E7=85=A7=E5=AE=A2=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/broad/ApiController.java       |  2 +-
 .../manage/controller/BaseCustomerController.java |  9 +--------
 .../manage/controller/BsaeFileController.java     | 15 ++++++++-------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
index 3e16e43..e1fba63 100644
--- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
+++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java
@@ -37,7 +37,7 @@ public class ApiController {
     @Autowired
     private IBaseCustomerService baseCustomerService;//客户
 
-    @ApiOperation(tags = {"首页"}, value = "客户-列表")
+    @ApiOperation(tags = {"首页","文档归档"}, value = "客户-列表")
     @GetMapping("/home/queryCustomer")
     public AjaxResult queryCustomer() {
         return success(baseCustomerService.selectBaseCustomerList(null));
diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/controller/BaseCustomerController.java b/haiwei-manage/src/main/java/com/haiwei/manage/controller/BaseCustomerController.java
index 8ece18c..abd75d6 100644
--- a/haiwei-manage/src/main/java/com/haiwei/manage/controller/BaseCustomerController.java
+++ b/haiwei-manage/src/main/java/com/haiwei/manage/controller/BaseCustomerController.java
@@ -55,14 +55,7 @@ public class BaseCustomerController extends BaseController {
         List<BaseCustomer> list = baseCustomerService.selectBaseCustomerList(baseCustomer);
         return getDataTable(list);
     }
-    @ApiOperation(tags = {"文档归档"}, value = "客户-列表")
-    @GetMapping("/customerList")
-    @ResponseBody
-    public AjaxResult queryCustomer(String name) {
-        BaseCustomer baseCustomer=new BaseCustomer();
-        baseCustomer.setCustomerName(name);
-        return AjaxResult.success(baseCustomerService.selectBaseCustomerList(baseCustomer));
-    }
+
 
     /**
      * 导出客户信息管理列表
diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/controller/BsaeFileController.java b/haiwei-manage/src/main/java/com/haiwei/manage/controller/BsaeFileController.java
index e03c31a..65f2c82 100644
--- a/haiwei-manage/src/main/java/com/haiwei/manage/controller/BsaeFileController.java
+++ b/haiwei-manage/src/main/java/com/haiwei/manage/controller/BsaeFileController.java
@@ -4,15 +4,12 @@ import java.util.List;
 
 import com.haiwei.manage.service.IBaseCustomerService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.haiwei.common.annotation.Log;
 import com.haiwei.common.enums.BusinessType;
 import com.haiwei.manage.domain.BsaeFile;
@@ -22,6 +19,8 @@ import com.haiwei.common.core.domain.AjaxResult;
 import com.haiwei.common.utils.poi.ExcelUtil;
 import com.haiwei.common.core.page.TableDataInfo;
 
+import javax.naming.Name;
+
 /**
  * 文档归档Controller
  *
@@ -128,8 +127,10 @@ public class BsaeFileController extends BaseController {
     @ApiOperation(tags = {"文档归档"}, value = "文件-列表")
     @PostMapping("/fileList")
     @ResponseBody
-    public AjaxResult list() {
-        List<BsaeFile> list = bsaeFileService.selectBsaeFileList(null);
+    public AjaxResult list(@RequestParam(value = "name",required = true) String name) {
+        BsaeFile bsaeFile=new BsaeFile();
+        bsaeFile.setCustomName(name);
+        List<BsaeFile> list = bsaeFileService.selectBsaeFileList(bsaeFile);
         return AjaxResult.success(list);
     }