From ae5928177e910e882ba37a953bcd52ae503f8c30 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 07 四月 2022 08:05:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index d6fb5f2..3fabcd7 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -23,7 +23,6 @@
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.web.BaseController;
-import com.zy.system.entity.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -128,8 +127,15 @@
     @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "浜у搧浠e彿鏁版嵁瀵煎嚭")
     public void export(@RequestParam(required = false) String fileName,
                        @RequestParam(required = false) Integer rowCount,
+                       @RequestParam(required = false) String ids,
                        HttpServletResponse response) throws Exception {
-        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+        List<MatCode> list = null;
+        if(!Cools.isEmpty(ids)){
+            list = matCodeService.selectList(new EntityWrapper<MatCode>().last("where mat_no in (" + ids + ")"));
+        }else{
+            list = matCodeService.selectList(new EntityWrapper<>());
+        }
+//        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
         List<MatCodeExcel> excels = new ArrayList<>();
         for (MatCode matCode : list) {
             MatCodeExcel excel = VersionUtils.getExcel(matCode);

--
Gitblit v1.9.1