From 88aa37e2ed5cc29592b4cff6f8faf7cc792ada0d Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Tue, 14 Dec 2021 09:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=BC=98=E5=8C=96-ZWW?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gaotao/modules/app/dao/SupplierMapper.java    | 7 ++++---
 .../modules/app/service/impl/SupplierServiceImpl.java      | 5 +++--
 src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java    | 6 ------
 src/main/resources/mapper/app/SupplierMapper.xml           | 4 ++++
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java b/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java
index ff6d941..9c71798 100644
--- a/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java
+++ b/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java
@@ -1,11 +1,10 @@
 package com.gaotao.modules.app.dao;
 
 import com.gaotao.modules.app.entity.Supplier;
-import java.util.List;
-
 import com.gaotao.modules.app.query.SupplierQuery;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Auther: Zuowenwen
@@ -62,4 +61,6 @@ public interface SupplierMapper {
     * @date 2021/7/19
     */
     int updateSupplier(SupplierQuery supplierQuery);
+
+    List<Supplier> getViewSupplierList(SupplierQuery supplierQuery);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java b/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java
index 4fb64bc..40df562 100644
--- a/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java
@@ -23,6 +23,7 @@ public class SupplierServiceImpl implements SupplierService {
     @Override
     public List<Supplier> getSupplierList(SupplierQuery supplierQuery) {
 
-        return supplierMapper.getSupplierList(supplierQuery);
+//        return supplierMapper.getSupplierList(supplierQuery);
+        return supplierMapper.getViewSupplierList(supplierQuery);
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java b/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java
index 4c4316d..7fb3141 100644
--- a/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java
+++ b/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java
@@ -3,9 +3,7 @@ package com.gaotao.modules.ftp.util;
 import com.gaotao.common.utils.ConfigConstant;
 import com.gaotao.common.utils.R;
 import com.gaotao.common.utils.SpringContextUtils;
-
 import com.gaotao.modules.oss.cloud.CloudStorageConfig;
-import com.gaotao.modules.oss.cloud.CloudStorageService;
 import com.gaotao.modules.pda.utils.ResponseData;
 import com.gaotao.modules.sys.service.SysConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -14,15 +12,11 @@ import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
 * 
diff --git a/src/main/resources/mapper/app/SupplierMapper.xml b/src/main/resources/mapper/app/SupplierMapper.xml
index 3bb3a76..b0fa934 100644
--- a/src/main/resources/mapper/app/SupplierMapper.xml
+++ b/src/main/resources/mapper/app/SupplierMapper.xml
@@ -183,4 +183,8 @@ A.Buyer,A.Currency,A.SupplierGroup,A.ABC,A.Active,A.CreateDate,A.BankName,A.Bank
             </if>
         </where>
     </update>
+
+  <select id="getViewSupplierList" resultMap="BaseResultMap">
+      select * from view_supplier
+    </select>
 </mapper>
\ No newline at end of file