From bf0f7b7f4c140386f1f75044cf1c93cde9e44820 Mon Sep 17 00:00:00 2001
From: Wanghong <1417307168@qq.com>
Date: Wed, 28 Jul 2021 18:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandUnqualifiedServiceImpl.java  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index e5c91ca3..1270bef4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -41,12 +41,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper
-                    .like("stand_id",sarStandUnqualifiedPage.getStandId())
-                    .like("stand_name",sarStandUnqualifiedPage.getStandId());
+        if(sarStandUnqualifiedPage.getStandId()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }
+        if (sarStandUnqualifiedPage.getStandName()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+        }
         //仅查询未关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",1);
         if(sarStandUnqualifiedPage.getProductName()!=null){
@@ -72,11 +73,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
-                    .like("stand_name",sarStandUnqualifiedPage.getStandId());
+        if(sarStandUnqualifiedPage.getStandId()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }
+        if (sarStandUnqualifiedPage.getStandName()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+        }
 
         //仅查询关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",2);
@@ -122,10 +125,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     public List<SarStandUnqualified> getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
         sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-        if(standUnqualifiedExcelVO.getIds()!=null&&standUnqualifiedExcelVO.getIds().size()>0){
+        if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
             sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
         }
-        return sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+               List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+        List<SarStandUnqualified> a = stand;
+        return a;
     }
 
     private boolean closeSarStandUnqualified(String standUnqualifiedId){