From c8d0cf9a76c15f119d94176a5e67073a561f64b7 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Fri, 16 Jun 2023 17:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarBussionessStandController.java         | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index 26b95169..07d9a10d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -55,6 +55,7 @@ import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
+import springfox.documentation.spring.web.json.Json;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -160,7 +161,6 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
             //导出数据
             if(StringUtils.isNotBlank(exportContent)){
                 if(exportContent.contains("pageSize") ){
-                    exportContent = "";
                      SarBussionessStandEOPage page = new SarBussionessStandEOPage();
                     page.setPage(1);
                     int count = sarBussionessStandEOService.count();
@@ -168,7 +168,25 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
                     page.setValidFlag("0");
                     page.setUserId(userId);
                     page.setIsKU("1");
+                    JSONObject jsonObject = JSONObject.parseObject(exportContent);
+                    if(jsonObject!=null){
+                        Object standName = jsonObject.get("standName");
+                        Object standCode = jsonObject.get("standCode");
+                        if(standName!=null){
+                            String standNameInfo = standName.toString();
+                            if(StringUtils.isNotBlank(standNameInfo)){
+                                page.setStandName(standNameInfo);
+                            }
+                        }
+                        if(standCode!=null){
+                            String standCodeInfo = standCode.toString();
+                            if(StringUtils.isNotBlank(standCodeInfo)){
+                                page.setStandCode(standCodeInfo);
+                            }
+                        }
+                    }
                     List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
+                    exportContent = "";
                     if(!rows.isEmpty()){
                        for (SarBussionessStand data: rows){
                            if(StringUtils.isNotBlank(exportContent)){